changeset 2499:92345664aa61

Ref #202: "Set as wallpaper" doesn't work with GNOME Shell https://github.com/BestImageViewer/geeqie/issues/202 Remove menu items for GTK3.
author Colin Clark <colin.clark@cclark.uk>
date Thu, 08 Jun 2017 11:46:20 +0100
parents a05ba0d6135c
children eb2ce489ceea
files src/img-view.c src/layout_image.c src/layout_util.c
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/img-view.c	Thu Jun 08 11:29:16 2017 +0100
+++ b/src/img-view.c	Thu Jun 08 11:46:20 2017 +0100
@@ -1274,8 +1274,9 @@
 			 G_CALLBACK(view_popup_menu_destroy_cb), editmenu_fd_list);
 	item = submenu_add_edit(menu, NULL, G_CALLBACK(view_edit_cb), vw, editmenu_fd_list);
 	menu_item_add_divider(item);
+#if !GTK_CHECK_VERSION(3,0,0)
 	menu_item_add(item, _("Set as _wallpaper"), G_CALLBACK(view_wallpaper_cb), vw);
-
+#endif
 	submenu_add_alter(menu, G_CALLBACK(view_alter_cb), vw);
 
 	menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(view_new_window_cb), vw);
--- a/src/layout_image.c	Thu Jun 08 11:29:16 2017 +0100
+++ b/src/layout_image.c	Thu Jun 08 11:46:20 2017 +0100
@@ -668,8 +668,9 @@
 	submenu = submenu_add_edit(menu, &item, G_CALLBACK(li_pop_menu_edit_cb), lw, editmenu_fd_list);
 	if (!path) gtk_widget_set_sensitive(item, FALSE);
 	menu_item_add_divider(submenu);
+#if !GTK_CHECK_VERSION(3,0,0)
 	menu_item_add(submenu, _("Set as _wallpaper"), G_CALLBACK(li_pop_menu_wallpaper_cb), lw);
-
+#endif
 	item = submenu_add_alter(menu, G_CALLBACK(li_pop_menu_alter_cb), lw);
 
 	item = menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(li_pop_menu_new_cb), lw);
--- a/src/layout_util.c	Thu Jun 08 11:29:16 2017 +0100
+++ b/src/layout_util.c	Thu Jun 08 11:46:20 2017 +0100
@@ -1788,7 +1788,9 @@
 "      </menu>"
 "      <placeholder name='PreferencesSection'/>"
 "      <separator/>"
+#if !GTK_CHECK_VERSION(3,0,0)
 "      <menuitem action='Wallpaper'/>"
+#endif
 "      <separator/>"
 "    </menu>"
 "    <menu action='ViewMenu'>"