# HG changeset patch # User Colin Clark # Date 1515179165 0 # Node ID 3f5967ca0a373021a0b3ba7e544350a1db50e40d # Parent 2ef77ac340852b57a1fd851d7f3e68b54b238fe8 Fix #566: submenu items "variable set but not used" errors in 1.4 https://github.com/BestImageViewer/geeqie/issues/566 diff -r 2ef77ac34085 -r 3f5967ca0a37 src/dupe.c --- 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); diff -r 2ef77ac34085 -r 3f5967ca0a37 src/img-view.c --- 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); diff -r 2ef77ac34085 -r 3f5967ca0a37 src/menu.c --- 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++; diff -r 2ef77ac34085 -r 3f5967ca0a37 src/search.c --- 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);