[maemo-commits] [maemo-commits] r8360 - in projects/haf/trunk/gtk+: . gdk/x11

[From: www-data at stage.maemo.org]

Author: tko
Date: 2006-11-27 17:24:13 +0200 (Mon, 27 Nov 2006)
New Revision: 8360

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdkinput-xfree.c
Log:
Check the right variable with g_return_if_fail.

2006-11-27  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gdk/x11/gdkinput-xfree.c (_gdk_input_other_event,
	_gdk_input_configure_event, _gdk_input_enter_event): Check the right
	variable with g_return_if_fail.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2006-11-27 15:20:55 UTC (rev 8359)
+++ projects/haf/trunk/gtk+/ChangeLog	2006-11-27 15:24:13 UTC (rev 8360)
@@ -1,3 +1,9 @@
+2006-11-27  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gdk/x11/gdkinput-xfree.c (_gdk_input_other_event,
+	_gdk_input_configure_event, _gdk_input_enter_event): Check the right
+	variable with g_return_if_fail.
+
 2006-11-21  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
 	* gtk/gtkwidget.c (gtk_widget_tap_and_hold_setup_real): Attach the

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkinput-xfree.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkinput-xfree.c	2006-11-27 15:20:55 UTC (rev 8359)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkinput-xfree.c	2006-11-27 15:24:13 UTC (rev 8360)
@@ -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