From e10bd21c92f8d6a82ed06bec7af9ee40bf5eb727 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 24 Dec 2006 23:02:33 +0000
Subject: [PATCH] Fixed some warnings

---
 src/ui/gui/about.c          | 3 ++-
 src/ui/gui/data-sheet.c     | 2 +-
 src/ui/gui/message-dialog.c | 1 -
 src/ui/gui/psppire.c        | 4 ----
 src/ui/gui/var-sheet.c      | 4 ++--
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/ui/gui/about.c b/src/ui/gui/about.c
index 258e96df..397ff5b8 100644
--- a/src/ui/gui/about.c
+++ b/src/ui/gui/about.c
@@ -22,7 +22,8 @@ about_new (GtkMenuItem *m, GtkWindow *parent)
 				 PKGDATADIR "/psppicon.png", 0);
 
 
-  gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (about), authors);
+  gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (about),
+				(const gchar **) authors);
 
   gtk_window_set_transient_for (GTK_WINDOW(about), parent);
 
diff --git a/src/ui/gui/data-sheet.c b/src/ui/gui/data-sheet.c
index 577b9551..9a3c0c52 100644
--- a/src/ui/gui/data-sheet.c
+++ b/src/ui/gui/data-sheet.c
@@ -181,7 +181,7 @@ psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
   gtk_sheet_set_active_cell (GTK_SHEET(sheet), -1, -1);
 
 
-  gtk_sheet_set_model (sheet, G_SHEET_MODEL(the_data_store));
+  gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL(the_data_store));
 
   gtk_widget_show (sheet);
 
diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index 9d3dc9bb..9afbee5b 100644
--- a/src/ui/gui/message-dialog.c
+++ b/src/ui/gui/message-dialog.c
@@ -97,7 +97,6 @@ enqueue_msg (const struct msg *msg)
 void
 popup_message (const struct msg *m)
 {
-  GtkWindow *parent;
   GtkWidget *dialog;
 
   gint message_type;
diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index bae77e87..218f9249 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -88,10 +88,6 @@ main (int argc, char *argv[])
   PsppireDict *dictionary = 0;
 
 
-  GtkWidget *data_editor ;
-  GtkSheet *var_sheet ;
-  GtkSheet *data_sheet ;
-
   gchar *filename=0;
   GError *err = 0;
   gchar *vers;
diff --git a/src/ui/gui/var-sheet.c b/src/ui/gui/var-sheet.c
index 331f343b..7f14602b 100644
--- a/src/ui/gui/var-sheet.c
+++ b/src/ui/gui/var-sheet.c
@@ -93,7 +93,7 @@ const gchar *const measures[n_MEASURES + 1]={
 };
 
 static GtkListStore *
-create_label_list (const gchar **labels)
+create_label_list (const gchar *const *labels)
 {
   const gchar *s;
   gint i = 0;
@@ -441,7 +441,7 @@ psppire_variable_sheet_create (gchar *widget_name,
 		    GTK_SIGNAL_FUNC (traverse_cell_callback), 0);
 
 
-  gtk_sheet_set_model (sheet, G_SHEET_MODEL(the_var_store));
+  gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL(the_var_store));
 
 
   /* Since this happens inside glade_xml_new, we must prevent strings from
-- 
2.30.2