[Pspp-cvs] pspp lib/gtksheet/gsheet-hetero-column.c lib/gt...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Branch:         
Changes by:     John Darrington <address@hidden>        06/05/07 10:11:51

Modified files:
        lib/gtksheet   : gsheet-hetero-column.c gsheet-uniform-row.c 
        po             : pspp.pot 
        src/data       : sys-file-reader.c 
        src/libpspp    : array.c array.h 
        src/ui/gui     : psppire-data-store.c psppire-var-store.c 
                         var-type-dialog.c 

Log message:
        Fixed a number of warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/lib/gtksheet/gsheet-hetero-column.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/lib/gtksheet/gsheet-uniform-row.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/po/pspp.pot.diff?tr1=1.84&tr2=1.85&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/sys-file-reader.c.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/libpspp/array.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/libpspp/array.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/psppire-data-store.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/psppire-var-store.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/var-type-dialog.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: pspp/lib/gtksheet/gsheet-hetero-column.c
diff -u pspp/lib/gtksheet/gsheet-hetero-column.c:1.2 
pspp/lib/gtksheet/gsheet-hetero-column.c:1.3
--- pspp/lib/gtksheet/gsheet-hetero-column.c:1.2        Tue Apr  4 12:43:21 2006
+++ pspp/lib/gtksheet/gsheet-hetero-column.c    Sun May  7 10:11:51 2006
@@ -116,8 +116,6 @@
 static gint 
 g_sheet_hetero_column_get_sensitivity(const GSheetColumn *geom, gint u)
 {
-  GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
-
   return TRUE;
 }
 
@@ -125,8 +123,6 @@
 static gint 
 g_sheet_hetero_column_get_visibility(const GSheetColumn *geom, gint u)
 {
-  GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
-
   return TRUE;
 }
 
@@ -136,7 +132,7 @@
 g_sheet_hetero_column_get_button_label(const GSheetColumn *geom, gint u)
 {
   GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
-  
+
   return hg->col[u].button.label;
 }
 
@@ -144,8 +140,6 @@
 static GtkJustification
 g_sheet_hetero_column_get_justification(const GSheetColumn *geom, gint u)
 {
-  GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
-  
   return GTK_JUSTIFY_FILL;
 }
 
Index: pspp/lib/gtksheet/gsheet-uniform-row.c
diff -u pspp/lib/gtksheet/gsheet-uniform-row.c:1.1 
pspp/lib/gtksheet/gsheet-uniform-row.c:1.2
--- pspp/lib/gtksheet/gsheet-uniform-row.c:1.1  Sat Mar  4 01:11:56 2006
+++ pspp/lib/gtksheet/gsheet-uniform-row.c      Sun May  7 10:11:51 2006
@@ -123,8 +123,6 @@
 static const gchar *
 g_sheet_uniform_row_get_button_label(const GSheetRow *geom, gint u)
 {
-  GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geom);
-  
   static gchar *label; 
   g_free(label);
   label = g_strdup_printf("%d", u);
Index: pspp/po/pspp.pot
diff -u pspp/po/pspp.pot:1.84 pspp/po/pspp.pot:1.85
--- pspp/po/pspp.pot:1.84       Sun May  7 02:18:31 2006
+++ pspp/po/pspp.pot    Sun May  7 10:11:51 2006
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-07 09:52+0800\n"
+"POT-Creation-Date: 2006-05-07 12:07+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -1755,13 +1755,13 @@
 msgid "Cannot add value labels from source file to long string variable %s."
 msgstr ""
 
-#: src/language/dictionary/apply-dictionary.c:135
+#: src/language/dictionary/apply-dictionary.c:104
 #, c-format
 msgid ""
 "Cannot apply missing values from source file to long string variable %s."
 msgstr ""
 
-#: src/language/dictionary/apply-dictionary.c:155
+#: src/language/dictionary/apply-dictionary.c:124
 msgid "No matching variables found between the source and target files."
 msgstr ""
 
Index: pspp/src/data/sys-file-reader.c
diff -u pspp/src/data/sys-file-reader.c:1.16 
pspp/src/data/sys-file-reader.c:1.17
--- pspp/src/data/sys-file-reader.c:1.16        Sun May  7 02:18:32 2006
+++ pspp/src/data/sys-file-reader.c     Sun May  7 10:11:51 2006
@@ -66,7 +66,7 @@
 
   /* Variables. */
   struct hsh_table *var_hash;
-  struct variable *const *svars;
+  struct variable **svars;
 
   /* File's special constants. */
   flt64 sysmis;
@@ -1693,7 +1693,7 @@
 
   if ( ! r->svars ) 
     {
-      r->svars = (struct variable *const *) hsh_data(r->var_hash);
+      r->svars = (struct variable **) hsh_data(r->var_hash);
       sort(r->svars, hsh_count(r->var_hash), 
           sizeof(*r->svars), compare_var_index, 0);
     }
Index: pspp/src/libpspp/array.c
diff -u pspp/src/libpspp/array.c:1.2 pspp/src/libpspp/array.c:1.3
--- pspp/src/libpspp/array.c:1.2        Sun May  7 02:18:32 2006
+++ pspp/src/libpspp/array.c    Sun May  7 10:11:51 2006
@@ -595,7 +595,7 @@
       stack size is needed (actually O(1) in this case)!  */
 
 void
-sort (const void *array, size_t count, size_t size,
+sort (void *array, size_t count, size_t size,
       algo_compare_func *compare, void *aux)
 {
   char *const first = array;
Index: pspp/src/libpspp/array.h
diff -u pspp/src/libpspp/array.h:1.2 pspp/src/libpspp/array.h:1.3
--- pspp/src/libpspp/array.h:1.2        Sun May  7 02:18:32 2006
+++ pspp/src/libpspp/array.h    Sun May  7 10:11:51 2006
@@ -45,7 +45,7 @@
 /* Sorts ARRAY, which contains COUNT elements of SIZE bytes each,
    using COMPARE for comparisons.  AUX is passed to each
    comparison as auxiliary data. */
-void sort (const void *array, size_t count, size_t size,
+void sort (void *array, size_t count, size_t size,
            algo_compare_func *compare, void *aux);
 
 /* Tests whether ARRAY, which contains COUNT elements of SIZE
Index: pspp/src/ui/gui/psppire-data-store.c
diff -u pspp/src/ui/gui/psppire-data-store.c:1.5 
pspp/src/ui/gui/psppire-data-store.c:1.6
--- pspp/src/ui/gui/psppire-data-store.c:1.5    Sun May  7 02:18:32 2006
+++ pspp/src/ui/gui/psppire-data-store.c        Sun May  7 10:11:51 2006
@@ -48,7 +48,7 @@
 static void psppire_data_store_sheet_column_init (GSheetColumnIface *iface);
 static void psppire_data_store_finalize        (GObject           *object);
 
-static const gchar *const psppire_data_store_get_string(GSheetModel 
*sheet_model, gint row, gint column);
+static const gchar *psppire_data_store_get_string(GSheetModel *sheet_model, 
gint row, gint column);
 
 static gboolean psppire_data_store_set_string(GSheetModel *model, 
                                          const gchar *text, gint row, gint 
column);
@@ -326,7 +326,7 @@
 }
 
 
-static const gchar *const 
+static const gchar *
 psppire_data_store_get_string(GSheetModel *model, gint row, gint column)
 {
 
Index: pspp/src/ui/gui/psppire-var-store.c
diff -u pspp/src/ui/gui/psppire-var-store.c:1.3 
pspp/src/ui/gui/psppire-var-store.c:1.4
--- pspp/src/ui/gui/psppire-var-store.c:1.3     Tue Apr  4 12:43:22 2006
+++ pspp/src/ui/gui/psppire-var-store.c Sun May  7 10:11:51 2006
@@ -30,6 +30,7 @@
 #include "psppire-variable.h"
 #include "psppire-var-store.h"
 #include "var-sheet.h"
+#include "helper.h"
 
 #include <data/dictionary.h>
 #include <data/variable.h>
@@ -48,7 +49,7 @@
 static void         psppire_var_store_sheet_model_init (GSheetModelIface 
*iface);
 static void         psppire_var_store_finalize        (GObject           
*object);
 
-static const gchar *const psppire_var_store_get_string(GSheetModel 
*sheet_model, gint row, gint column);
+static const gchar *psppire_var_store_get_string(GSheetModel *sheet_model, 
gint row, gint column);
 
 static gboolean  psppire_var_store_clear(GSheetModel *model,  gint row, gint 
col);
 
@@ -57,7 +58,7 @@
                                          const gchar *text, gint row, gint 
column);
 
 
-static const gchar *const text_for_column(const struct PsppireVariable *pv, 
gint c);
+static const gchar *text_for_column(const struct PsppireVariable *pv, gint c);
 
 
 static GObjectClass *parent_class = NULL;
@@ -295,7 +296,7 @@
   (* parent_class->finalize) (object);
 }
 
-static const gchar *const 
+static const gchar *
 psppire_var_store_get_string(GSheetModel *model, gint row, gint column)
 {
   const gchar *s ;
@@ -311,7 +312,7 @@
   
   s = text_for_column(pv, column);
 
-  return s;
+  return g_locale_to_utf8(s, -1, 0,0,0);
 }
 
 
@@ -416,7 +417,7 @@
 
 #define MAX_CELL_TEXT_LEN 255
 
-static const gchar *const
+static const gchar *
 text_for_column(const struct PsppireVariable *pv, gint c)
 {
   static gchar buf[MAX_CELL_TEXT_LEN];
Index: pspp/src/ui/gui/var-type-dialog.c
diff -u pspp/src/ui/gui/var-type-dialog.c:1.3 
pspp/src/ui/gui/var-type-dialog.c:1.4
--- pspp/src/ui/gui/var-type-dialog.c:1.3       Tue Apr  4 12:43:22 2006
+++ pspp/src/ui/gui/var-type-dialog.c   Sun May  7 10:11:51 2006
@@ -31,6 +31,7 @@
 #include "var-type-dialog.h"
 
 #include "psppire-variable.h"
+#include "helper.h"
 
 #include <data/variable.h>
 #include <data/settings.h>