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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2008-01-17 17:58:40 +0200 (Thu, 17 Jan 2008)
New Revision: 15101

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktoolbutton.c
Log:
2008-01-17  Xan Lopez  <xan.lopez at nokia.com>

        * gtk/gtktoolbutton.c (gtk_tool_button_init): proxy tap-and-hold
        signals for the GtkButton inside the GtkToolButton.

        Patch by Sergio Villar (NB#79312)


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-01-17 15:58:37 UTC (rev 15100)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-01-17 15:58:40 UTC (rev 15101)
@@ -1,3 +1,10 @@
+2008-01-17  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtktoolbutton.c (gtk_tool_button_init): proxy tap-and-hold
+	signals for the GtkButton inside the GtkToolButton.
+
+	Patch by Sergio Villar (NB#79312)
+
 2007-11-22  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkmenu.c: remove debug output.

Modified: projects/haf/trunk/gtk+/gtk/gtktoolbutton.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktoolbutton.c	2008-01-17 15:58:37 UTC (rev 15100)
+++ projects/haf/trunk/gtk+/gtk/gtktoolbutton.c	2008-01-17 15:58:40 UTC (rev 15101)
@@ -269,6 +269,24 @@
 {
   gtk_widget_insensitive_press (GTK_WIDGET (button));
 }
+static gboolean
+maemo_tap_and_hold_query (GtkWidget *widget, 
+			  GdkEvent *event)
+{
+  gboolean return_value = FALSE;
+
+  g_signal_emit_by_name (G_OBJECT (gtk_widget_get_parent (widget)), 
+			 "tap-and-hold-query", event, &return_value);
+
+  return return_value;
+}
+static void
+maemo_tap_and_hold (GtkWidget *widget, 
+		    gpointer *data)
+{
+  g_signal_emit_by_name (G_OBJECT (gtk_widget_get_parent (widget)), 
+			 "tap-and-hold");
+}
 #endif /* MAEMO_CHANGES */
 
 static void
@@ -288,9 +306,13 @@
 			   G_CALLBACK (button_clicked), button, 0);
 
 #ifdef MAEMO_CHANGES
-  /* Hildon: connect "insensitive_press" signal for private button */
+  /* Proxy signals from the GtkButton to the GtkToolButton */
   g_signal_connect_object (button->priv->button, "insensitive_press",
                            G_CALLBACK (maemo_insensitive_press), button, 0);
+  g_signal_connect_object (button->priv->button, "tap-and-hold-query",
+                           G_CALLBACK (maemo_tap_and_hold_query), button, 0);
+  g_signal_connect_object (button->priv->button, "tap-and-hold",
+                           G_CALLBACK (maemo_tap_and_hold), button, 0);
 #endif /* MAEMO_CHANGES */
 
   gtk_container_add (GTK_CONTAINER (button), button->priv->button);