From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 13 Mar 2009 00:35:48 +0000 (+0900)
Subject: Don't proxy button-open to action_data_open.
X-Git-Tag: v0.7.3~234
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccdebe6fb14add7beff4294d2b65cdec43c44c77;p=pspp-builds.git

Don't proxy button-open to action_data_open.

Connect to the clicked signal instead, because we
don't want the icon, label etc. to assume that of
the action.  Closes bug #25817
---

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index ccfa9ad1..5d35551a 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -1101,8 +1101,10 @@ psppire_data_window_init (PsppireDataWindow *de)
 
 
   {
+    GtkWidget *toolbarbutton = get_widget_assert (de->builder, "button-open");
+
     GtkAction *action_data_open =
-      resolve_action (de->builder, "file_open_data", "button-open");
+      resolve_action (de->builder, "file_open_data", NULL);
 
     g_object_set (action_data_open,
 		  "tooltip",  _("Open a data file"),
@@ -1111,6 +1113,9 @@ psppire_data_window_init (PsppireDataWindow *de)
 
     g_signal_connect (action_data_open, "activate",
 		      G_CALLBACK (open_data_dialog), de);
+
+    g_signal_connect_swapped (toolbarbutton, "clicked",
+		      G_CALLBACK (gtk_action_activate), action_data_open);
   }