diff src/dupe.c @ 1698:bfe04f01de5e

fixed destroying of menu data Make sure that menu destroy functions do not access parent widget structures that are already destroyed There are 2 ways to achieve this: - use g_signal_handlers_disconnect_matched() like in vf_destroy_cb() - use separate data structure passed to *_popup_menu_destroy_cb() like in img-view.

--- a/src/dupe.c	Sat Jul 18 08:16:54 2009 +0000
+++ b/src/dupe.c	Tue Jul 21 14:17:01 2009 +0000
@@ -2207,10 +2207,9 @@
 
 static void dupe_menu_popup_destroy_cb(GtkWidget *widget, gpointer data)
 {
-	DupeWindow *dw = data;
-
-	filelist_free(dw->editmenu_fd_list);
-	dw->editmenu_fd_list = NULL;
+	GList *editmenu_fd_list = data;
+
+	filelist_free(editmenu_fd_list);
 }	
 
 static GList *dupe_window_get_fd_list(DupeWindow *dw)
@@ -2234,12 +2233,11 @@
 	GtkWidget *menu;
 	GtkWidget *item;
 	gint on_row;
+	GList *editmenu_fd_list;
 
 	on_row = (di != NULL);
 
 	menu = popup_menu_short_lived();
-	g_signal_connect(G_OBJECT(menu), "destroy",
-			 G_CALLBACK(dupe_menu_popup_destroy_cb), dw);
 
 	menu_item_add_sensitive(menu, _("_View"), on_row,
 				G_CALLBACK(dupe_menu_view_cb), dw);
@@ -2256,8 +2254,10 @@
 				G_CALLBACK(dupe_menu_select_dupes_set2_cb), dw);
 	menu_item_add_divider(menu);
 	
-	dw->editmenu_fd_list = dupe_window_get_fd_list(dw);
-	submenu_add_edit(menu, &item, G_CALLBACK(dupe_menu_edit_cb), dw, dw->editmenu_fd_list);
+	editmenu_fd_list = dupe_window_get_fd_list(dw);
+	g_signal_connect(G_OBJECT(menu), "destroy",
+			 G_CALLBACK(dupe_menu_popup_destroy_cb), editmenu_fd_list);
+	submenu_add_edit(menu, &item, G_CALLBACK(dupe_menu_edit_cb), dw, editmenu_fd_list);
 	if (!on_row) gtk_widget_set_sensitive(item, FALSE);
 	menu_item_add_stock_sensitive(menu, _("Add to new collection"), GTK_STOCK_INDEX, on_row,
 				G_CALLBACK(dupe_menu_collection_cb), dw);