[Goodies-commits] r6347 - in sion/trunk: . src

[Enrico Troeger]

Author: enrico
Date: 2008-12-21 01:27:26 +0000 (Sun, 21 Dec 2008)
New Revision: 6347

Modified:
   sion/trunk/ChangeLog
   sion/trunk/src/menubuttonaction.c
Log:
Emit the "button-clicked" only if a toolbar button was clicked.

Modified: sion/trunk/ChangeLog
===================================================================
--- sion/trunk/ChangeLog	2008-12-21 01:19:20 UTC (rev 6346)
+++ sion/trunk/ChangeLog	2008-12-21 01:27:26 UTC (rev 6347)
@@ -4,6 +4,8 @@
    Fix crash when parsing an URI without a proper scheme (bug #4730).
  * src/window.c:
    Minimise to tray if enabled.
+ * src/menubuttonaction.c:
+   Emit the "button-clicked" only if a toolbar button was clicked.
 
 
 2008-12-19  Enrico Tröger  <enrico(at)xfce(dot)org>

Modified: sion/trunk/src/menubuttonaction.c
===================================================================
--- sion/trunk/src/menubuttonaction.c	2008-12-21 01:19:20 UTC (rev 6346)
+++ sion/trunk/src/menubuttonaction.c	2008-12-21 01:27:26 UTC (rev 6347)
@@ -82,7 +82,7 @@
 }
 
 
-static void delegate_button_activated(GtkAction *action)
+static void delegate_button_clicked(GtkToolButton *button, GtkAction *action)
 {
 	g_signal_emit(action, signals[BUTTON_CLICKED], 0);
 }
@@ -103,6 +103,7 @@
 	GtkWidget *toolitem;
 
 	toolitem = g_object_new(GTK_TYPE_MENU_TOOL_BUTTON, NULL);
+	g_signal_connect(toolitem, "clicked", G_CALLBACK(delegate_button_clicked), action);
 
 	return toolitem;
 }
@@ -209,7 +210,6 @@
 
 	g_object_class->set_property = sion_menu_button_action_set_property;
 
-	action_class->activate = delegate_button_activated;
 	action_class->connect_proxy = sion_menu_button_action_connect_proxy;
 	action_class->create_menu_item = sion_menu_button_action_create_menu_item;
 	action_class->create_tool_item = sion_menu_button_action_create_tool_item;