Test for NULL before calling strdup

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

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index 54c751d6fab5e4ed2a93a1baad6bc9682a262bec..a02edb289a90c7987d5b5ef1d031ecaaec244831 100644 (file)
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -145,7 +145,7 @@ psppire_window_set_property (GObject         *object,
              candidate_name = uniquify (name, &x);
            }
 
-         window->basename = g_path_get_basename (candidate_name);
+         window->basename = g_filename_display_basename (candidate_name);
 
          g_value_unset (&def);
        }
@@ -315,7 +315,10 @@ menu_activate (GtkMenuItem *mi, gpointer data)
 static void
 insert_menuitem_into_menu (PsppireWindow *window, gpointer key)
 {
-  GtkWidget *item = gtk_check_menu_item_new_with_label (key);
+  gchar *filename = g_filename_display_name (key);
+  GtkWidget *item = gtk_check_menu_item_new_with_label (filename);
+
+  g_free (filename);
 
   g_signal_connect (item, "toggled", G_CALLBACK (menu_toggled), NULL);
   g_signal_connect (item, "activate", G_CALLBACK (menu_activate), key);
@@ -449,6 +452,7 @@ psppire_window_init (PsppireWindow *window)
 gint
 psppire_window_query_save (PsppireWindow *se)
 {
+  gchar *fn;
   gint response;
   GtkWidget *dialog;
   GtkWidget *cancel_button;
@@ -465,13 +469,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);
 
@@ -625,6 +632,7 @@ psppire_window_load (PsppireWindow *w, const gchar *file)
 
   if ( ok )
     {
+      psppire_window_set_filename (w, file);
       add_most_recent (file, the_recent_mgr);
       w->dirty = FALSE;
     }