[maemo-commits] [maemo-commits] r9246 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gdk/x11

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-01-23 12:31:29 +0200 (Tue, 23 Jan 2007)
New Revision: 9246

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkinput-xfree.c
Log:
2007-01-23  Michael Natterer  <mitch at imendio.com>

	* gdk/x11/gdkinput-xfree.c: g_return_if_fail on the right objects.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-23 10:31:09 UTC (rev 9245)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-23 10:31:29 UTC (rev 9246)
@@ -1,3 +1,7 @@
+2007-01-23  Michael Natterer  <mitch at imendio.com>
+
+	* gdk/x11/gdkinput-xfree.c: g_return_if_fail on the right objects.
+
 2007-01-19  Michael Natterer  <mitch at imendio.com>
 
 	Backport infrastructure and changes for notification on failed

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkinput-xfree.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkinput-xfree.c	2007-01-23 10:31:09 UTC (rev 9245)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkinput-xfree.c	2007-01-23 10:31:29 UTC (rev 9246)
@@ -150,7 +150,7 @@
   gint root_x, root_y;
 
   input_window = _gdk_input_window_find(window);
-  g_return_if_fail (window != NULL);
+  g_return_if_fail (input_window != NULL);
 
   _gdk_input_get_root_relative_geometry(GDK_WINDOW_XDISPLAY (window),
 					GDK_WINDOW_XWINDOW (window),
@@ -168,7 +168,7 @@
   gint root_x, root_y;
 
   input_window = _gdk_input_window_find (window);
-  g_return_if_fail (window != NULL);
+  g_return_if_fail (input_window != NULL);
 
   gdk_input_check_proximity(GDK_WINDOW_DISPLAY (window));
 
@@ -192,7 +192,7 @@
   GdkDisplayX11 *display_impl = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
 
   input_window = _gdk_input_window_find(window);
-  g_return_val_if_fail (window != NULL, FALSE);
+  g_return_val_if_fail (input_window != NULL, FALSE);
 
   /* This is a sort of a hack, as there isn't any XDeviceAnyEvent -
      but it's potentially faster than scanning through the types of