Ref #202: "Set as wallpaper" doesn't work with GNOME Shell

https://github.com/BestImageViewer/geeqie/issues/202

Remove menu items for GTK3.

diff --git a/src/img-view.c b/src/img-view.c
index 00aff7e..31b3170 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -1274,8 +1274,9 @@ static GtkWidget *view_popup_menu(ViewWindow *vw)
                         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);
                         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);
        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);
        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);

diff --git a/src/layout_image.c b/src/layout_image.c
index dc141ae..2e40174 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -668,8 +668,9 @@ static GtkWidget *layout_image_pop_menu(LayoutWindow *lw)
        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);
        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);
        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);
        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);

diff --git a/src/layout_util.c b/src/layout_util.c
index 36e2705..4a82bfe 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -1788,7 +1788,9 @@ static const gchar *menu_ui_description =
 "      </menu>"
 "      <placeholder name='PreferencesSection'/>"
 "      <separator/>"
 "      </menu>"
 "      <placeholder name='PreferencesSection'/>"
 "      <separator/>"

+#if !GTK_CHECK_VERSION(3,0,0)

 "      <menuitem action='Wallpaper'/>"
 "      <menuitem action='Wallpaper'/>"

+#endif

 "      <separator/>"
 "    </menu>"
 "    <menu action='ViewMenu'>"
 "      <separator/>"
 "    </menu>"
 "    <menu action='ViewMenu'>"