Add "dictionary" property to PsppireVarStore and use it.

[pspp-builds.git] / src / ui / gui / psppire-window.c

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index b95e6a00075c4395b2857bd571ce4e4667f1f70b..70500e6a0b4f1fa8a78228aa95fdb05ba58c1b2b 100644 (file)
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -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))
            {
@@ -411,7 +412,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);
 
@@ -452,6 +453,7 @@ psppire_window_init (PsppireWindow *window)
 gint
 psppire_window_query_save (PsppireWindow *se)
 {
+  gchar *fn;
   gint response;
   GtkWidget *dialog;
   GtkWidget *cancel_button;
@@ -468,13 +470,16 @@ psppire_window_query_save (PsppireWindow *se)
   g_return_val_if_fail (filename != NULL, GTK_RESPONSE_NONE);
 
 
+  fn = g_filename_display_basename (filename);
+
   dialog =
     gtk_message_dialog_new (GTK_WINDOW (se),
                            GTK_DIALOG_MODAL,
                            GTK_MESSAGE_WARNING,
                            GTK_BUTTONS_NONE,
                            _("Save the changes to \"%s\" before closing?"),
-                           filename);
+                           fn);
+  g_free (fn);
 
   g_object_set (dialog, "icon-name", "psppicon", NULL);