changeset 2701:3f5967ca0a37

Fix #566: submenu items "variable set but not used" errors in 1.4 https://github.com/BestImageViewer/geeqie/issues/566
author Colin Clark <colin.clark@cclark.uk>
date Fri, 05 Jan 2018 19:06:05 +0000
parents 2ef77ac34085
children c8b8f40f0dd0
files src/dupe.c src/img-view.c src/menu.c src/search.c
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/dupe.c	Thu Jan 04 17:06:16 2018 +0000
+++ b/src/dupe.c	Fri Jan 05 19:06:05 2018 +0000
@@ -2362,7 +2362,7 @@
 	submenu_add_edit(menu, &item, G_CALLBACK(dupe_menu_edit_cb), dw, editmenu_fd_list);
 	if (!on_row) gtk_widget_set_sensitive(item, FALSE);
 
-	submenu = submenu_add_collections(menu, &item,
+	submenu_add_collections(menu, &item,
 								G_CALLBACK(dupe_pop_menu_collections_cb), dw);
 	gtk_widget_set_sensitive(item, on_row);
 
--- a/src/img-view.c	Thu Jan 04 17:06:16 2018 +0000
+++ b/src/img-view.c	Fri Jan 05 19:06:05 2018 +0000
@@ -1335,7 +1335,7 @@
 
 	menu_item_add_divider(menu);
 
-	submenu = submenu_add_collections(menu, &item,
+	submenu_add_collections(menu, &item,
 				G_CALLBACK(image_pop_menu_collections_cb), vw);
 	gtk_widget_set_sensitive(item, TRUE);
 	menu_item_add_divider(menu);
--- a/src/menu.c	Thu Jan 04 17:06:16 2018 +0000
+++ b/src/menu.c	Fri Jan 05 19:06:05 2018 +0000
@@ -417,7 +417,7 @@
 		{
 		const gchar *collection_name = work->data;
 
-		item = menu_item_add(menu, collection_name, func,
+		menu_item_add(menu, collection_name, func,
 													GINT_TO_POINTER(index));
 		work = work->next;
 		index++;
--- a/src/search.c	Thu Jan 04 17:06:16 2018 +0000
+++ b/src/search.c	Fri Jan 05 19:06:05 2018 +0000
@@ -1087,7 +1087,7 @@
 	submenu_add_edit(menu, &item, G_CALLBACK(sr_menu_edit_cb), sd, editmenu_fd_list);
 	if (!on_row) gtk_widget_set_sensitive(item, FALSE);
 
-	submenu = submenu_add_collections(menu, &item,
+	submenu_add_collections(menu, &item,
 				G_CALLBACK(search_pop_menu_collections_cb), sd);
 	gtk_widget_set_sensitive(item, on_row);