Remove deprecated objects GtkAction and GtkUIManager

[pspp] / src / ui / gui / psppire-dialog-action-sort.c

diff --git a/src/ui/gui/psppire-dialog-action-sort.c b/src/ui/gui/psppire-dialog-action-sort.c
index 024a659de15992d725abdd16eccf07934d7a081e..2a0be711a71670be60d73b5cb23c14ce15a1add1 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-sort.c
+++ b/src/ui/gui/psppire-dialog-action-sort.c
@@ -30,7 +30,7 @@ static void psppire_dialog_action_sort_class_init      (PsppireDialogActionSortC
 G_DEFINE_TYPE (PsppireDialogActionSort, psppire_dialog_action_sort, PSPPIRE_TYPE_DIALOG_ACTION);
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionSort *scd = PSPPIRE_DIALOG_ACTION_SORT (act);
   gchar *text;
@@ -90,12 +90,12 @@ dialog_state_valid (gpointer act)
 
 
 static void
-psppire_dialog_action_sort_activate (GtkAction *a)
+psppire_dialog_action_sort_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionSort *act = PSPPIRE_DIALOG_ACTION_SORT (a);
 
-  GHashTable *thing = psppire_dialog_action_get_pointer (pda);
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
   GtkBuilder *xml = g_hash_table_lookup (thing, a);
   if (!xml)
     {
@@ -114,8 +114,6 @@ psppire_dialog_action_sort_activate (GtkAction *a)
   psppire_dialog_action_set_valid_predicate (pda,
                                      dialog_state_valid);
 
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_sort_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_sort_parent_class)->activate (pda);
 }
 
 static void