? clip.patch
? index.html
? libtool
? pspp-0.4.3.tar.gz
? pspp.jnl
? temperature.txt
? thecore
? doc/.dirstamp
? glade/.deps
? lib/gsl-extras/.deps
? lib/gsl-extras/.dirstamp
? lib/gtksheet/.deps
? lib/gtksheet/.dirstamp
? lib/linreg/.deps
? lib/linreg/.dirstamp
? po/pspp.pot
? src/data/.deps
? src/data/.dirstamp
? src/language/.deps
? src/language/.dirstamp
? src/language/control/.deps
? src/language/control/.dirstamp
? src/language/data-io/.deps
? src/language/data-io/.dirstamp
? src/language/dictionary/.deps
? src/language/dictionary/.dirstamp
? src/language/expressions/.deps
? src/language/expressions/.dirstamp
? src/language/expressions/x
? src/language/lexer/.deps
? src/language/lexer/.dirstamp
? src/language/stats/.deps
? src/language/stats/.dirstamp
? src/language/stats/glm.c
? src/language/tests/.deps
? src/language/tests/.dirstamp
? src/language/tests/check-model.c
? src/language/utilities/.deps
? src/language/utilities/.dirstamp
? src/language/utilities/x
? src/language/xforms/.deps
? src/language/xforms/.dirstamp
? src/libpspp/.deps
? src/libpspp/.dirstamp
? src/math/.deps
? src/math/.dirstamp
? src/math/linreg/.deps
? src/math/linreg/.dirstamp
? src/math/ts/.deps
? src/math/ts/.dirstamp
? src/output/.deps
? src/output/.dirstamp
? src/output/charts/.deps
? src/output/charts/.dirstamp
? src/ui/.deps
? src/ui/.dirstamp
? src/ui/gui/.deps
? src/ui/gui/.dirstamp
? src/ui/gui/.libs
? src/ui/gui/libpsppire.la
? src/ui/gui/src_ui_gui_libpsppire_la-glade-register.lo
? src/ui/gui/y
? src/ui/terminal/.deps
? src/ui/terminal/.dirstamp
? tests/.deps
? tests/.dirstamp
? tests/.libs
? tests/dissect-sysfile
? tests/formats/.deps
? tests/formats/.dirstamp
? tests/libpspp/.deps
? tests/libpspp/.dirstamp
? tests/libpspp/abt-test
? tests/libpspp/bt-test
? tests/libpspp/heap-test
? tests/libpspp/range-map-test
? tests/libpspp/range-set-test
? tests/libpspp/sparse-array-test
? tests/libpspp/str-test
? tests/libpspp/tower-test
Index: lib/gtksheet/gtksheet.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.c,v
retrieving revision 1.45
diff -U 3 -r1.45 gtksheet.c
--- lib/gtksheet/gtksheet.c	25 Mar 2008 09:19:30 -0000	1.45
+++ lib/gtksheet/gtksheet.c	2 May 2008 01:39:06 -0000
@@ -7849,10 +7849,21 @@
 }
 
 
+static void
+append_cell_text (GString *string, const GtkSheet *sheet, gint r, gint c)
+{
+  gchar *celltext = gtk_sheet_cell_get_text (sheet, r, c);
+
+  if ( NULL == celltext)
+    return;
+
+  g_string_append (string, celltext);
+  g_free (celltext);
+}
+
 static GString *
 range_to_text (const GtkSheet *sheet)
 {
-  gchar *celltext = NULL;
   gint r, c;
   GString *string;
 
@@ -7865,16 +7876,12 @@
     {
       for (c = sheet->range.col0; c < sheet->range.coli; ++c)
 	{
-	  celltext = gtk_sheet_cell_get_text (sheet, r, c);
-	  g_string_append (string, celltext);
+	  append_cell_text (string, sheet, r, c);
 	  g_string_append (string, "\t");
-	  g_free (celltext);
 	}
-      celltext = gtk_sheet_cell_get_text (sheet, r, c);
-      g_string_append (string, celltext);
+      append_cell_text (string, sheet, r, c);
       if ( r < sheet->range.rowi)
 	g_string_append (string, "\n");
-      g_free (celltext);
     }
 
   return string;
@@ -7883,7 +7890,6 @@
 static GString *
 range_to_html (const GtkSheet *sheet)
 {
-  gchar *celltext = NULL;
   gint r, c;
   GString *string;
 
@@ -7901,10 +7907,8 @@
       for (c = sheet->range.col0; c <= sheet->range.coli; ++c)
 	{
 	  g_string_append (string, "<td>");
-	  celltext = gtk_sheet_cell_get_text (sheet, r, c);
-	  g_string_append (string, celltext);
+	  append_cell_text (string, sheet, r, c);
 	  g_string_append (string, "</td>\n");
-	  g_free (celltext);
 	}
       g_string_append (string, "</tr>\n");
     }