[maemo-commits] [maemo-commits] r16556 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2008-11-03 15:54:42 +0200 (Mon, 03 Nov 2008)
New Revision: 16556

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkwidget.c
Log:
2008-11-03  Kristian Rietveld  <kris at imendio.com>

	Fixes NB#91448: CSM shown no matter what tap-and-hold-query returns

	* gtk/gtkwidget.c (gtk_widget_tap_and_hold_query_accumulate): stop
	emission as soon as a signal handler has run.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-11-03 10:48:08 UTC (rev 16555)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-11-03 13:54:42 UTC (rev 16556)
@@ -1,3 +1,10 @@
+2008-11-03  Kristian Rietveld  <kris at imendio.com>
+
+	Fixes NB#91448: CSM shown no matter what tap-and-hold-query returns
+
+	* gtk/gtkwidget.c (gtk_widget_tap_and_hold_query_accumulate): stop
+	emission as soon as a signal handler has run.
+
 2008-10-27  Kristian Rietveld  <kris at imendio.com>
 
 	Fixes NB#89408: Unable to select an item in the list picker

Modified: projects/haf/trunk/gtk+/gtk/gtkwidget.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkwidget.c	2008-11-03 10:48:08 UTC (rev 16555)
+++ projects/haf/trunk/gtk+/gtk/gtkwidget.c	2008-11-03 13:54:42 UTC (rev 16556)
@@ -10591,7 +10591,6 @@
                                            const GValue          *handler_return,
                                            gpointer               dummy)
 {
-  gboolean continue_emission;
   gboolean tap_and_hold_not_allowed;
 
   /* The semantics of the tap-and-hold-query return value differs from
@@ -10601,12 +10600,8 @@
   tap_and_hold_not_allowed = g_value_get_boolean (handler_return);
   g_value_set_boolean (return_accu, tap_and_hold_not_allowed);
 
-  /* tap_and_hold_not_allowed == FALSE means invoke tap-and-hold,
-   * in this case we do not continue emission.
-   */
-  continue_emission = (tap_and_hold_not_allowed != FALSE);
-
-  return continue_emission;
+  /* Now that a single handler has run, we stop emission. */
+  return FALSE;
 }
 
 static gboolean