From 9f02fea4c295d47ba1234a5a6129962e5e340745 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 1 Jul 2011 18:18:59 +0200
Subject: [PATCH] Remove action member from PsppireSelector

---
 src/ui/gui/psppire-selector.c | 26 ++++++++++++++------------
 src/ui/gui/psppire-selector.h |  1 -
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/ui/gui/psppire-selector.c b/src/ui/gui/psppire-selector.c
index 135bac99..7b301060 100644
--- a/src/ui/gui/psppire-selector.c
+++ b/src/ui/gui/psppire-selector.c
@@ -151,7 +151,7 @@ enum
 };
 
 
-static void on_activate (PsppireSelector *selector, gpointer data);
+static void on_click (GtkButton *b);
 
 static void update_subjects (PsppireSelector *selector);
 
@@ -218,6 +218,7 @@ static void
 psppire_selector_class_init (PsppireSelectorClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkButtonClass *button_class = GTK_BUTTON_CLASS (class);
   GParamSpec *orientation_spec =
     g_param_spec_enum ("orientation",
 		       "Orientation",
@@ -250,6 +251,8 @@ psppire_selector_class_init (PsppireSelectorClass *class)
 			 G_PARAM_READWRITE);
 
 
+  button_class->clicked = on_click;
+
   object_class->set_property = psppire_selector_set_property;
   object_class->get_property = psppire_selector_get_property;
 
@@ -323,9 +326,7 @@ on_row_activate (GtkTreeView       *tree_view,
 		 GtkTreeViewColumn *column,
 		 gpointer           data)
 {
-  PsppireSelector *selector  = data;
-
-  gtk_action_activate (selector->action);
+  on_click (GTK_BUTTON (data));
 }
 
 /* Callback for when the source selection changes */
@@ -338,12 +339,12 @@ on_source_select (GtkTreeSelection *treeselection, gpointer data)
 
   if ( selector->allow_selection )
     {
-      gtk_action_set_sensitive (selector->action,
+      gtk_widget_set_sensitive (GTK_WIDGET (selector),
 				selector->allow_selection (selector->source, selector->dest));
     }
   else if ( GTK_IS_ENTRY (selector->dest) )
     {
-      gtk_action_set_sensitive (selector->action,
+      gtk_widget_set_sensitive (GTK_WIDGET (selector),
 				gtk_tree_selection_count_selected_rows
 				(treeselection) <= 1 );
     }
@@ -392,16 +393,11 @@ psppire_selector_init (PsppireSelector *selector)
   selector->arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE);
   selector->filtered_source = NULL;
 
-  selector->action = gtk_action_new ("select", NULL, NULL, "pspp-stock-select");
-
-  gtk_action_connect_proxy (selector->action, GTK_WIDGET (selector));
 
   gtk_container_add (GTK_CONTAINER (selector), selector->arrow);
 
   gtk_widget_show (selector->arrow);
 
-  g_signal_connect_swapped (selector->action, "activate", G_CALLBACK (on_activate), selector);
-
   selector->selecting = FALSE;
 
   selector->source = NULL;
@@ -627,8 +623,10 @@ select_selection (PsppireSelector *selector)
    or other event which causes the selector's action to occur.
  */
 static void
-on_activate (PsppireSelector *selector, gpointer data)
+on_click (GtkButton *b)
 {
+  PsppireSelector *selector = PSPPIRE_SELECTOR (b);
+
   switch (selector->direction)
     {
     case PSPPIRE_SELECTOR_SOURCE_TO_DEST:
@@ -641,6 +639,10 @@ on_activate (PsppireSelector *selector, gpointer data)
       g_assert_not_reached ();
       break;
     }
+
+  if (GTK_BUTTON_CLASS (parent_class)->clicked)
+    GTK_BUTTON_CLASS (parent_class)->clicked (b);
+
 }
 
 static gboolean
diff --git a/src/ui/gui/psppire-selector.h b/src/ui/gui/psppire-selector.h
index 028af187..af3d45a3 100644
--- a/src/ui/gui/psppire-selector.h
+++ b/src/ui/gui/psppire-selector.h
@@ -71,7 +71,6 @@ struct _PsppireSelector
 
   /* <private> */
   GtkWidget *arrow;
-  GtkAction *action;
 
   gboolean dispose_has_run;
 
-- 
2.30.2