From 3a1a4a18f0371b955a91346df9c9958ccce0a14d Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 6 Feb 2012 22:13:01 -0800
Subject: [PATCH] gui: Fix warnings due to missing GObject type conversions.

---
 src/ui/gui/psppire-dialog-action-correlation.c |  4 +++-
 src/ui/gui/psppire-dialog-action-kmeans.c      |  3 ++-
 src/ui/gui/psppire-dialog-action-reliability.c |  4 +++-
 src/ui/gui/psppire-dialog-action-roc.c         |  3 ++-
 src/ui/gui/psppire-dialog-action-sort.c        | 10 ++++++----
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/ui/gui/psppire-dialog-action-correlation.c b/src/ui/gui/psppire-dialog-action-correlation.c
index c86dd51165..456ce15d32 100644
--- a/src/ui/gui/psppire-dialog-action-correlation.c
+++ b/src/ui/gui/psppire-dialog-action-correlation.c
@@ -78,8 +78,10 @@ dialog_state_valid (gpointer user_data)
 }
 
 static void
-refresh (PsppireDialogActionCorrelation *rd)
+refresh (PsppireDialogAction *rd_)
 {
+  PsppireDialogActionCorrelation *rd =
+    PSPPIRE_DIALOG_ACTION_CORRELATION (rd_);
   GtkTreeModel *liststore =
     gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variables));
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
diff --git a/src/ui/gui/psppire-dialog-action-kmeans.c b/src/ui/gui/psppire-dialog-action-kmeans.c
index 3656a5d9b9..bcd59889f5 100644
--- a/src/ui/gui/psppire-dialog-action-kmeans.c
+++ b/src/ui/gui/psppire-dialog-action-kmeans.c
@@ -71,8 +71,9 @@ dialog_state_valid (gpointer user_data)
 }
 
 static void
-refresh (PsppireDialogActionKmeans *fd)
+refresh (PsppireDialogAction *fd_)
 {
+  PsppireDialogActionKmeans *fd = PSPPIRE_DIALOG_ACTION_KMEANS (fd_);
   GtkTreeModel *liststore =
     gtk_tree_view_get_model (GTK_TREE_VIEW (fd->variables));
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
diff --git a/src/ui/gui/psppire-dialog-action-reliability.c b/src/ui/gui/psppire-dialog-action-reliability.c
index 296d1526e2..67d8c186a5 100644
--- a/src/ui/gui/psppire-dialog-action-reliability.c
+++ b/src/ui/gui/psppire-dialog-action-reliability.c
@@ -81,8 +81,10 @@ on_method_change (PsppireDialogActionReliability *pda)
 
 
 static void
-refresh (PsppireDialogActionReliability *pda)
+refresh (PsppireDialogAction *pda_)
 {
+  PsppireDialogActionReliability *pda =
+    PSPPIRE_DIALOG_ACTION_RELIABILITY (pda_);
   GtkTreeModel *liststore =
     gtk_tree_view_get_model (GTK_TREE_VIEW (pda->variables));
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
diff --git a/src/ui/gui/psppire-dialog-action-roc.c b/src/ui/gui/psppire-dialog-action-roc.c
index 5d25132fdc..fc0bb7be44 100644
--- a/src/ui/gui/psppire-dialog-action-roc.c
+++ b/src/ui/gui/psppire-dialog-action-roc.c
@@ -77,8 +77,9 @@ on_curve_button_toggle (GtkCheckButton *curve, PsppireDialogActionRoc *rd)
 }
 
 static void
-refresh (PsppireDialogActionRoc *rd)
+refresh (PsppireDialogAction *rd_)
 {
+  PsppireDialogActionRoc *rd = PSPPIRE_DIALOG_ACTION_ROC (rd_);
   GtkTreeModel *liststore =
     gtk_tree_view_get_model (GTK_TREE_VIEW (rd->test_variables));
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
diff --git a/src/ui/gui/psppire-dialog-action-sort.c b/src/ui/gui/psppire-dialog-action-sort.c
index 2a80a6e7dc..29c3c8063e 100644
--- a/src/ui/gui/psppire-dialog-action-sort.c
+++ b/src/ui/gui/psppire-dialog-action-sort.c
@@ -36,7 +36,8 @@ generate_syntax (PsppireDialogAction *act)
   gchar *text;
   GString *string = g_string_new ("SORT CASES BY ");
 
-  gint n_vars = psppire_var_view_append_names (scd->variables, 0, string);
+  PsppireVarView *var_view = PSPPIRE_VAR_VIEW (scd->variables);
+  gint n_vars = psppire_var_view_append_names (var_view, 0, string);
 
   if ( n_vars == 0 )
     {
@@ -45,7 +46,8 @@ generate_syntax (PsppireDialogAction *act)
   else
     {
       const char up_down =
-	gtk_toggle_button_get_active (scd->ascending) ? 'A' : 'D';
+	(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->ascending))
+         ? 'A' : 'D');
       g_string_append_printf (string, "(%c)", up_down);
       g_string_append (string, ".");
     }
@@ -66,14 +68,14 @@ reset (PsppireDialogAction *act)
 
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
 
-  gtk_toggle_button_set_active (scd->ascending, TRUE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scd->ascending), TRUE);
 }
 
 
 
 
 static gboolean
-dialog_state_valid (PsppireDialogAction *act)
+dialog_state_valid (gpointer act)
 {
   PsppireDialogActionSort *scd = PSPPIRE_DIALOG_ACTION_SORT (act);
   GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (scd->variables));
-- 
2.30.2