Merge remote branch 'origin/master' into import-gui

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

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index 4c7fcf57dc2040c32357e9e371bbad8f6339d75d..23c512d792dbb6a58769549f5408719093adc8a0 100644 (file)
--- 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, 2010, 2011  Free Software Foundation
+   Copyright (C) 2009, 2010, 2011, 2013  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
@@ -236,6 +236,8 @@ psppire_window_finalize (GObject *object)
 
   PsppireWindowRegister *reg = psppire_window_register_new ();
 
+  g_signal_handler_disconnect (reg, window->remove_handler);
+  g_signal_handler_disconnect (reg, window->insert_handler);
   psppire_window_register_remove (reg, window->list_name);
   g_free (window->filename);
   g_free (window->basename);
@@ -243,12 +245,6 @@ psppire_window_finalize (GObject *object)
   g_free (window->description);
   g_free (window->list_name);
 
-  g_signal_handler_disconnect (psppire_window_register_new (),
-                              window->remove_handler);
-
-  g_signal_handler_disconnect (psppire_window_register_new (),
-                              window->insert_handler);
-
   g_hash_table_destroy (window->menuitem_table);
 
   if (G_OBJECT_CLASS (parent_class)->finalize)
@@ -340,11 +336,12 @@ insert_menuitem_into_menu (PsppireWindow *window, gpointer key)
 
   /* Add a separator before adding the first real item.  If we add a separator
      at any other time, sometimes GtkUIManager removes it. */
-  if (g_hash_table_size (window->menuitem_table) == 0)
+  if (!window->added_separator)
     {
       GtkWidget *separator = gtk_separator_menu_item_new ();
       gtk_widget_show (separator);
       gtk_menu_shell_append (window->menu, separator);
+      window->added_separator = TRUE;
     }
 
   filename = g_filename_display_name (key);
@@ -467,6 +464,7 @@ psppire_window_init (PsppireWindow *window)
                                             G_CALLBACK (remove_menuitem),
                                             window);
 
+  window->added_separator = FALSE;
   window->dirty = FALSE;
 
   g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window);