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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-05-23 11:55:11 +0300 (Wed, 23 May 2007)
New Revision: 11766

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c
Log:
2007-05-23  Michael Natterer  <mitch at imendio.com>

	* gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event): remove
	duplicate call to _gdk_event_button_generate() which was
	introduced by GTK 2.10.12 upgrade mis-merge.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-22 15:27:17 UTC (rev 11765)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-23 08:55:11 UTC (rev 11766)
@@ -1,3 +1,9 @@
+2007-05-23  Michael Natterer  <mitch at imendio.com>
+
+	* gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event): remove
+	duplicate call to _gdk_event_button_generate() which was
+	introduced by GTK 2.10.12 upgrade mis-merge.
+
 2007-05-21  Michael Natterer  <mitch at imendio.com>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_set_model): allow NULL models

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c	2007-05-22 15:27:17 UTC (rev 11765)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c	2007-05-23 08:55:11 UTC (rev 11766)
@@ -602,10 +602,6 @@
         _gdk_event_button_generate (gdk_drawable_get_display (event->button.window),
                                     event);
 
-      if (event->button.type == GDK_BUTTON_PRESS)
-	_gdk_event_button_generate (gdk_drawable_get_display (event->button.window),
-				    event);
-
       GDK_NOTE (EVENTS,
 	g_print ("button %s:\t\twindow: %ld  device: %ld  x,y: %f %f  button: %d\n",
 		 (event->button.type == GDK_BUTTON_PRESS) ? "press" : "release",