diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2006-03-29 02:10:49 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2006-03-29 02:10:49 +0000 |
| commit | a5fd7d91172970d75b1aeaa729125dbbc56615f7 (patch) | |
| tree | ca5922e7b75c7b43746e0956a0fdca759e5de7aa | |
| parent | 57647f74642e672bc7082aed84141b456659e464 (diff) | |
Bug #6420 <https://bugs.freedesktop.org/show_bug.cgi?id=6420> Patch #5103XORG-7_0_99_901
<https://bugs.freedesktop.org/attachment.cgi?id=5103> xclock code
contains wrong "ifdef RENDER" (Kirill Belokurov)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Clock.c | 6 | ||||
| -rw-r--r-- | XClock-color.ad | 3 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2006-03-28 Alan Coopersmith <alan.coopersmith@sun.com> + + * Clock.c: + * XClock-color.ad: + Bug #6420 <https://bugs.freedesktop.org/show_bug.cgi?id=6420> + Patch #5103 <https://bugs.freedesktop.org/attachment.cgi?id=5103> + xclock code contains wrong "ifdef RENDER" (Kirill Belokurov) + 2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: @@ -1140,11 +1140,11 @@ Destroy(Widget gw) { ClockWidget w = (ClockWidget) gw; if (w->clock.interval_id) XtRemoveTimeOut (w->clock.interval_id); -#ifdef RENDER +#ifdef XRENDER if (w->clock.picture) - XRenderFreePicture (dpy, w->clock.picture); + XRenderFreePicture (XtDisplay(w), w->clock.picture); if (w->clock.fill_picture) - XRenderFreePicture (dpy, w->clock.fill_picture); + XRenderFreePicture (XtDisplay(w), w->clock.fill_picture); #endif XtReleaseGC (gw, w->clock.myGC); XtReleaseGC (gw, w->clock.HighGC); diff --git a/XClock-color.ad b/XClock-color.ad index d8acb7e..ec857f6 100644 --- a/XClock-color.ad +++ b/XClock-color.ad @@ -2,10 +2,9 @@ #include "XClock" -#ifdef RENDER XClock.Clock.hourColor: rgba:7f/00/00/c0 XClock.Clock.minuteColor: rgba:00/7f/7f/c0 XClock.Clock.secondColor: rgba:00/00/ff/80 XClock.Clock.majorColor: rgba:7f/00/00/c0 XClock.Clock.minorColor: rgba:00/7f/7f/c0 -#endif + |