X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.c;h=e03732fc365c6c555adf0e513454a91e22e66db6;hb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;hp=a02edb289a90c7987d5b5ef1d031ecaaec244831;hpb=08c5dc634be53868ff996f24a765f89c61433377;p=pspp

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index a02edb289a..e03732fc36 100644
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009  Free Software Foundation
+   Copyright (C) 2009, 2010  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #include <gtk/gtkmain.h>
 
 #include <stdlib.h>
+#include <xalloc.h>
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -137,7 +138,7 @@ psppire_window_set_property (GObject         *object,
 	      name = g_value_get_string (&def);
 	    }
 
-	  candidate_name = strdup (name);
+	  candidate_name = xstrdup (name);
 
 	  while ( psppire_window_register_lookup (reg, candidate_name))
 	    {
@@ -202,19 +203,6 @@ on_realize (GtkWindow *window, gpointer data)
 }
 
 
-static gboolean
-save_geometry (GtkWidget *window, GdkEvent *event, gpointer data)
-{
-  const gchar *base = G_OBJECT_TYPE_NAME (window);
-
-  PsppireConf *conf = psppire_conf_new ();
-
-  psppire_conf_save_window_geometry (conf, base, event);
-
-  return FALSE;
-}
-
-
 static void
 psppire_window_finalize (GObject *object)
 {
@@ -255,7 +243,8 @@ psppire_window_class_init (PsppireWindowClass *class)
     g_param_spec_string ("filename",
 		       "File name",
 		       "The name of the file associated with this window, if any",
-			 "Untitled",
+			 /* TRANSLATORS: This will form a filename.  Please avoid whitespace. */
+			 _("Untitled"),
 			 G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
 
   g_unichar_to_utf8 (0x2014, mdash);
@@ -381,6 +370,13 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data)
 {
   PsppireWindowRegister *reg = psppire_window_register_new ();
 
+  const gchar *base = G_OBJECT_TYPE_NAME (w);
+
+  PsppireConf *conf = psppire_conf_new ();
+
+  psppire_conf_save_window_geometry (conf, base, GTK_WINDOW (w));
+
+
   if ( w->dirty )
     {
       gint response = psppire_window_query_save (w);
@@ -411,7 +407,7 @@ psppire_window_init (PsppireWindow *window)
 {
   window->name = NULL;
   window->menu = NULL;
-  window->description = strdup ("");
+  window->description = xstrdup ("");
 
   window->menuitem_table  = g_hash_table_new (g_str_hash, g_str_equal);
 
@@ -434,12 +430,6 @@ psppire_window_init (PsppireWindow *window)
 
   g_object_set (window, "icon-name", "psppicon", NULL);
 
-  g_signal_connect (window, "configure-event",
-		    G_CALLBACK (save_geometry), window);
-
-  g_signal_connect (window, "window-state-event",
-		    G_CALLBACK (save_geometry), window);
-
   g_signal_connect (window, "realize",
 		    G_CALLBACK (on_realize), window);
 
@@ -476,7 +466,7 @@ psppire_window_query_save (PsppireWindow *se)
 			    GTK_DIALOG_MODAL,
 			    GTK_MESSAGE_WARNING,
 			    GTK_BUTTONS_NONE,
-			    _("Save the changes to \"%s\" before closing?"),
+			    _("Save the changes to `%s' before closing?"),
 			    fn);
   g_free (fn);