From a5fd7d91172970d75b1aeaa729125dbbc56615f7 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed, 29 Mar 2006 02:10:49 +0000
Subject: 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)

---
 ChangeLog       | 8 ++++++++
 Clock.c         | 6 +++---
 XClock-color.ad | 3 +--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f782e91..a3f2883 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
diff --git a/Clock.c b/Clock.c
index b734b39..efff6ca 100644
--- a/Clock.c
+++ b/Clock.c
@@ -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
+
-- 
cgit v1.2.3