projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-data-window.c: Remove ssw api protection
[pspp]
/
src
/
ui
/
gui
/
psppire-window.c
diff --git
a/src/ui/gui/psppire-window.c
b/src/ui/gui/psppire-window.c
index 7d478a642bfa38d87d807c5a2e3aac490f07f9e6..8dcde94ad53c739ff20f6900967932cf16a8af86 100644
(file)
--- a/
src/ui/gui/psppire-window.c
+++ b/
src/ui/gui/psppire-window.c
@@
-326,6
+326,7
@@
insert_menuitem_into_menu (PsppireWindow *window, gpointer key)
GtkWidget *item;
filename = g_filename_display_name (key);
item = gtk_check_menu_item_new_with_label (filename);
GtkWidget *item;
filename = g_filename_display_name (key);
item = gtk_check_menu_item_new_with_label (filename);
+ g_object_ref_sink (item);
g_free (filename);
g_hash_table_insert (window->menuitem_table, key, item);
g_free (filename);
g_hash_table_insert (window->menuitem_table, key, item);
@@
-411,17
+412,19
@@
psppire_window_init (PsppireWindow *window)
window->list_name = NULL;
window->edited = NULL;
window->list_name = NULL;
window->edited = NULL;
- window->menuitem_table = g_hash_table_new (g_str_hash, g_str_equal);
+ window->menuitem_table = g_hash_table_new_full (g_str_hash, g_str_equal,
+ NULL, g_object_unref);
g_signal_connect (window, "realize", G_CALLBACK (insert_existing_items), NULL);
g_signal_connect (window, "realize", G_CALLBACK (insert_existing_items), NULL);
- window->insert_handler = g_signal_connect (psppire_window_register_new (),
+ PsppireWindowRegister *reg = psppire_window_register_new ();
+ window->insert_handler = g_signal_connect (reg,
"inserted",
G_CALLBACK (insert_menuitem),
window);
"inserted",
G_CALLBACK (insert_menuitem),
window);
- window->remove_handler = g_signal_connect (
psppire_window_register_new ()
,
+ window->remove_handler = g_signal_connect (
reg
,
"removed",
G_CALLBACK (remove_menuitem),
window);
"removed",
G_CALLBACK (remove_menuitem),
window);