gnome-panel r11093 - trunk/applets/clock

[federico svn gnome org]

Author: federico
Date: Thu May  8 22:56:20 2008
New Revision: 11093
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11093&view=rev

Log:
GDK_WINDOW_XWINDOW, not GDK_WINDOW_XID

Signed-off-by: Federico Mena Quintero <federico gnu org>


Modified:
   trunk/applets/clock/clock-location-tile.c
   trunk/applets/clock/clock.c

Modified: trunk/applets/clock/clock-location-tile.c
==============================================================================
--- trunk/applets/clock/clock-location-tile.c	(original)
+++ trunk/applets/clock/clock-location-tile.c	Thu May  8 22:56:20 2008
@@ -7,6 +7,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
 #include "clock.h"
 #include "clock-face.h"
@@ -198,9 +199,9 @@
 
 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (tile));
 	if (toplevel && toplevel->window)
-		xid = GDK_WINDOW_XID (toplevel->window);
+		xid = GDK_WINDOW_XWINDOW (toplevel->window);
 	else
-		xid = NULL;
+		xid = 0;
 
 	clock_location_make_current (priv->location,
 				     xid,

Modified: trunk/applets/clock/clock.c
==============================================================================
--- trunk/applets/clock/clock.c	(original)
+++ trunk/applets/clock/clock.c	Thu May  8 22:56:20 2008
@@ -1744,7 +1744,7 @@
 
 	tim = mktime (&t);
 
-	set_system_time_async (tim, GDK_WINDOW_XID (cd->applet->window), (GFunc)set_time_callback, cd, NULL);
+	set_system_time_async (tim, GDK_WINDOW_XWINDOW (cd->applet->window), (GFunc)set_time_callback, cd, NULL);
 }
 
 static void
@@ -2216,7 +2216,7 @@
 					  latitude, longitude, code, &prefs);
 
 	if (current && clock_location_is_current_timezone (loc))
-		clock_location_make_current (loc, GDK_WINDOW_XID (cd->applet->window), NULL, NULL, NULL);
+		clock_location_make_current (loc, GDK_WINDOW_XWINDOW (cd->applet->window), NULL, NULL, NULL);
 
         data->cities = g_list_append (data->cities, loc);
 }