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

[geeqie.git] / src / layout_image.c

diff --git a/src/layout_image.c b/src/layout_image.c
index 3dd2183..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);
+#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);
@@ -2000,16 +2001,19 @@ static void layout_image_setup_split_common(LayoutWindow *lw, gint n)
                                GList *work = g_list_last(layout_selection_list(lw));
                                gint j = 0;
 
-                               if (work) work = work->prev;
-
                                while (work && j < i)
                                        {
                                        FileData *fd = work->data;
                                        work = work->prev;
 
-                                       j++;
-                                       if (!fd || !*fd->path) continue;
+                                       if (!fd || !*fd->path || fd->parent ||
+                                                                               fd == lw->split_images[0]->image_fd)
+                                               {
+                                               continue;
+                                               }
                                        img_fd = fd;
+
+                                       j++;
                                        }
                                }