From 6234cd81c073b8a08077847d08a22c1715d903ae Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 6 Mar 2009 21:27:24 +0900
Subject: [PATCH] Remove some unused variables

---
 src/ui/gui/about.c                 | 2 +-
 src/ui/gui/psppire-output-window.c | 2 +-
 src/ui/gui/psppire-var-sheet.c     | 4 +---
 src/ui/gui/psppire-var-store.c     | 2 +-
 src/ui/gui/psppire-window.c        | 2 --
 src/ui/gui/psppire.c               | 1 -
 src/ui/gui/var-display.c           | 2 +-
 7 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/ui/gui/about.c b/src/ui/gui/about.c
index 8ca91cbe..c217833c 100644
--- a/src/ui/gui/about.c
+++ b/src/ui/gui/about.c
@@ -25,7 +25,7 @@
 #include "helper.h"
 
 
-const static gchar *artists[] = { "Patrick Brunier", "Dondi Bogusky", NULL};
+static const gchar *artists[] = { "Patrick Brunier", "Dondi Bogusky", NULL};
 
 void
 about_new (GtkMenuItem *m, GtkWindow *parent)
diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 7f7d2765..106b4ad0 100644
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -298,7 +298,7 @@ reload_viewer (PsppireOutputWindow *ow)
   GtkTextIter end_iter;
   GtkTextMark *mark ;
 
-  static char *line = NULL;
+  char *line = NULL;
 
   gboolean chars_inserted = FALSE;
 
diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index ed9a4268..e02e8108 100644
--- a/src/ui/gui/psppire-var-sheet.c
+++ b/src/ui/gui/psppire-var-sheet.c
@@ -121,9 +121,7 @@ create_label_list (const gchar *const *labels)
   gint i = 0;
   GtkTreeIter iter;
 
-  GtkListStore *list_store;
-  list_store = gtk_list_store_new (1, G_TYPE_STRING);
-
+  GtkListStore *list_store = gtk_list_store_new (1, G_TYPE_STRING);
 
   while ( (s = labels[i++]))
     {
diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index cdb32719..82a7ef10 100644
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -540,7 +540,7 @@ psppire_var_store_set_string (PsppireSheetModel *model,
 }
 
 
-const static gchar none[] = N_("None");
+static const gchar none[] = N_("None");
 
 static  gchar *
 text_for_column (const struct variable *pv, gint c, GError **err)
diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index f0d6d916..576d3159 100644
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -40,7 +40,6 @@ static void psppire_window_class_init    (PsppireWindowClass *class);
 static void psppire_window_init          (PsppireWindow      *window);
 
 
-static PsppireWindowClass *the_class;
 static GObjectClass *parent_class;
 
 GType
@@ -272,7 +271,6 @@ psppire_window_class_init (PsppireWindowClass *class)
                                    PROP_FILENAME,
                                    filename_spec);
 
-  the_class = class;
   parent_class = g_type_class_peek_parent (class);
 }
 
diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 35dad91e..3d0d8649 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -301,6 +301,5 @@ output_file_name (void)
   if ( NULL == filename )
     filename = xasprintf ("%s%s", dir, OUTPUT_FILE_NAME);
 
-
   return filename;
 }
diff --git a/src/ui/gui/var-display.c b/src/ui/gui/var-display.c
index c69730f6..07c7a473 100644
--- a/src/ui/gui/var-display.c
+++ b/src/ui/gui/var-display.c
@@ -11,7 +11,7 @@
 
 #include "helper.h"
 
-const static gchar none[] = N_("None");
+static const gchar none[] = N_("None");
 
 gchar *
 name_to_string (const struct variable *var, GError **err)
-- 
2.30.2