Fix #314: Remote commands for thumbnail maintenance

[geeqie.git] / src / img-view.c

diff --git a/src/img-view.c b/src/img-view.c
index 35b0ca3..31b3170 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -600,7 +600,8 @@ static void scroll_cb(ImageWindow *imd, GdkEventScroll *event, gpointer data)
 {
        ViewWindow *vw = data;
 
-       if (event->state & GDK_CONTROL_MASK)
+       if ((event->state & GDK_CONTROL_MASK) ||
+                               (imd->mouse_wheel_mode && !options->image_lm_click_nav))
                {
                switch (event->direction)
                        {
@@ -905,7 +906,9 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
        req_size.height = h;
        gtk_widget_size_allocate(GTK_WIDGET(vw->window), &req_size);
 
+#if !GTK_CHECK_VERSION(3,0,0)
        gtk_widget_set_size_request(vw->imd->pr, w, h);
+#endif
 
        gtk_widget_show(vw->window);
 
@@ -1271,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);
+#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);