From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 1 Dec 2008 10:04:44 +0000 (+0900)
Subject: Removed an unsed variable and used an unused macro
X-Git-Tag: v0.7.1~87
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2650e15cd547bd3a69e972d1a5fb5be61bd5db2e;p=pspp-builds.git

Removed an unsed variable and used an unused macro
---

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index f21dfbd6..4d5ffcf1 100644
--- a/src/ui/gui/psppire-data-store.c
+++ b/src/ui/gui/psppire-data-store.c
@@ -736,13 +736,11 @@ static const gchar null_var_name[]=N_("var");
 static gchar *
 get_row_button_label (const GSheetModel *model, gint unit)
 {
-  gchar *text;
-  gchar *s;
   PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
 
-  s = g_strdup_printf (_("%d"), unit + 1);
+  gchar *s = g_strdup_printf (_("%d"), unit + FIRST_CASE_NUMBER);
 
-  text =  pspp_locale_to_utf8 (s, -1, 0);
+  gchar *text =  pspp_locale_to_utf8 (s, -1, 0);
 
   g_free (s);
 
diff --git a/src/ui/gui/psppire-data-store.h b/src/ui/gui/psppire-data-store.h
index b6160651..058f9e14 100644
--- a/src/ui/gui/psppire-data-store.h
+++ b/src/ui/gui/psppire-data-store.h
@@ -82,9 +82,6 @@ struct _PsppireDataStore
 
   gboolean show_labels;
 
-  /* Geometry */
-  gint margin_width;
-
   gint cf_handler_id [n_cf_signals];
   gint dict_handler_id [n_dict_signals];
 };