X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-count.c;h=8f9a9281efdc3d56c7db679cc6745636b293ce9a;hb=31547a75c54ea46b3915d96f41ca0c52484d6b8a;hp=69174950b1ce5c10bbd1ba98a75e314074bb8790;hpb=fc6620099bbc53762095569d5356b67a81a85402;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-count.c b/src/ui/gui/psppire-dialog-action-count.c
index 69174950b1..8f9a9281ef 100644
--- a/src/ui/gui/psppire-dialog-action-count.c
+++ b/src/ui/gui/psppire-dialog-action-count.c
@@ -43,7 +43,7 @@ G_DEFINE_TYPE (PsppireDialogActionCount, psppire_dialog_action_count, PSPPIRE_TY
 
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionCount *cnt = PSPPIRE_DIALOG_ACTION_COUNT (act);
   gchar *text = NULL;
@@ -51,7 +51,7 @@ generate_syntax (PsppireDialogAction *act)
   gboolean ok;
   GtkTreeIter iter;
   struct string dds;
-  
+
   ds_init_empty (&dds);
 
   ds_put_cstr (&dds, "\nCOUNT ");
@@ -145,12 +145,12 @@ refresh (PsppireDialogAction *rd_)
 }
 
 static void
-psppire_dialog_action_count_activate (GtkAction *a)
+psppire_dialog_action_count_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionCount *act = PSPPIRE_DIALOG_ACTION_COUNT (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)
     {
@@ -178,8 +178,6 @@ psppire_dialog_action_count_activate (GtkAction *a)
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
 
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_count_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_count_parent_class)->activate (pda);
 }
 
 static void
@@ -232,7 +230,7 @@ set_value (gint col, GValue  *val, gpointer data)
   PsppireDialogActionCount *cnt = PSPPIRE_DIALOG_ACTION_COUNT (data);
   PsppireValChooser *vc = PSPPIRE_VAL_CHOOSER (cnt->chooser);
   struct old_value ov;
-	
+
   g_assert (col == 0);
 
   psppire_val_chooser_get_status (vc, &ov);