File gnome-packagekit-XGetWindowProperty.patch of Package gnome-packagekit

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-packagekit-XGetWindowProperty.patch of Package gnome-packagekit (Revision 5d31ebe1000969f429a3f25fe790c9e2)

Currently displaying revision 5d31ebe1000969f429a3f25fe790c9e2 , Show latest

--- src/gpk-x11.c
+++ src/gpk-x11.c
@@ -94,7 +94,7 @@ gpk_x11_get_user_time (GpkX11 *x11)
 	gint format_return;
 	gulong nitems_return;
 	gulong bytes_after_return;
-	Window *win = NULL;
+	Window win = None;
 	int rc;
 
 	g_return_val_if_fail (GPK_IS_X11 (x11), 0);
@@ -111,26 +111,32 @@ gpk_x11_get_user_time (GpkX11 *x11)
 				 &type_return, &format_return, &nitems_return, &bytes_after_return, &data);
 	if (rc == Success) {
 		if ((type_return == XA_WINDOW) && (format_return == 32) && (data)) {
-			win = (Window *)data;
-			egg_debug ("got window %p", win);
+			unsigned long tmp;
+			memcpy (&tmp, data, sizeof(unsigned long));
+			win = (Window)tmp;
+			egg_debug ("got window %#lx", win);
 		}
+		XFree(data);
 	}
 
 	/* nothing found */
-	if (win == NULL) {
+	if (win == None) {
 		egg_warning ("could not find window %i", (gint) x11->priv->window);
 		goto out;
 	}
 
 	/* get _NET_WM_USER_TIME so we can get the user time */
 	atom = gdk_x11_get_xatom_by_name_for_display (x11->priv->gdk_display, "_NET_WM_USER_TIME");
-	rc = XGetWindowProperty (x11->priv->display, *win, atom, 0, G_MAXLONG, False, XA_CARDINAL,
+	rc = XGetWindowProperty (x11->priv->display, win, atom, 0, G_MAXLONG, False, XA_CARDINAL,
 				 &type_return, &format_return, &nitems_return, &bytes_after_return, &data);
 	if (rc == Success) {
 		if ((type_return == XA_CARDINAL) && (format_return == 32) && (data)) {
-			timestamp = (guint32) *data;
+			unsigned long tmp;
+			memcpy (&tmp, data, sizeof(unsigned long));
+			timestamp = (guint32) tmp;
 			egg_debug ("got timestamp %i", timestamp);
 		}
+		XFree(data);
 	}
 
 out:

Places

File gnome-packagekit-XGetWindowProperty.patch of Package gnome-packagekit (Revision 5d31ebe1000969f429a3f25fe790c9e2)

Places