From efb5f9d4069ba66eeffa4bbc21e555ec772d9ace Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Sat, 15 Oct 2016 16:53:42 +0200
Subject: [PATCH 2/2] Revert "icon-container: don't use eel helper to set
 adjustment values"

This reverts commit 1f7ab5dcbca155f331735a8483d768ea0c349c18.
---
 libcaja-private/caja-icon-container.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index af8de17..80d209b 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -623,8 +623,8 @@ caja_icon_container_scroll (CajaIconContainer *container,
     old_h_value = gtk_adjustment_get_value (hadj);
     old_v_value = gtk_adjustment_get_value (vadj);
 
-    gtk_adjustment_set_value (hadj, gtk_adjustment_get_value (hadj) + delta_x);
-    gtk_adjustment_set_value (vadj, gtk_adjustment_get_value (vadj) + delta_y);
+    eel_gtk_adjustment_set_value (hadj, gtk_adjustment_get_value (hadj) + delta_x);
+    eel_gtk_adjustment_set_value (vadj, gtk_adjustment_get_value (vadj) + delta_y);
 
     /* return TRUE if we did scroll */
     return gtk_adjustment_get_value (hadj) != old_h_value || gtk_adjustment_get_value (vadj) != old_v_value;
@@ -778,18 +778,18 @@ reveal_icon (CajaIconContainer *container,
         item_get_canvas_bounds (EEL_CANVAS_ITEM (icon->item), &bounds, TRUE);
     }
     if (bounds.y0 < gtk_adjustment_get_value (vadj)) {
-        gtk_adjustment_set_value (vadj, bounds.y0);
+        eel_gtk_adjustment_set_value (vadj, bounds.y0);
     } else if (bounds.y1 > gtk_adjustment_get_value (vadj) + allocation.height) {
-        gtk_adjustment_set_value (vadj, bounds.y1 - allocation.height);
+        eel_gtk_adjustment_set_value (vadj, bounds.y1 - allocation.height);
     }
 
     if (bounds.x0 < gtk_adjustment_get_value (hadj)) {
-        gtk_adjustment_set_value (hadj, bounds.x0);
+        eel_gtk_adjustment_set_value (hadj, bounds.x0);
     } else if (bounds.x1 > gtk_adjustment_get_value (hadj) + allocation.width) {
         if (bounds.x1 - allocation.width > bounds.x0) {
-            gtk_adjustment_set_value (hadj, bounds.x0);
+            eel_gtk_adjustment_set_value (hadj, bounds.x0);
         } else {
-            gtk_adjustment_set_value (hadj, bounds.x1 - allocation.width);
+            eel_gtk_adjustment_set_value (hadj, bounds.x1 - allocation.width);
         }
     }
 }
@@ -1230,6 +1230,11 @@ caja_icon_container_update_scroll_region (CajaIconContainer *container)
     {
         gtk_adjustment_set_step_increment (vadj, step_increment);
     }
+    /* Now that we have a new scroll region, clamp the
+     * adjustments so we are within the valid scroll area.
+     */
+    eel_gtk_adjustment_clamp_value (hadj);
+    eel_gtk_adjustment_clamp_value (vadj); 
 }
 
 static int
@@ -7475,12 +7480,12 @@ caja_icon_container_scroll_to_icon (CajaIconContainer  *container,
 
             if (caja_icon_container_is_layout_vertical (container)) {
                 if (caja_icon_container_is_layout_rtl (container)) {
-                    gtk_adjustment_set_value (hadj, bounds.x1 - allocation.width);
+                    eel_gtk_adjustment_set_value (hadj, bounds.x1 - allocation.width);
                 } else {
-                    gtk_adjustment_set_value (hadj, bounds.x0);
+                    eel_gtk_adjustment_set_value (hadj, bounds.x0);
                 }
             } else {
-                gtk_adjustment_set_value (vadj, bounds.y0);
+                eel_gtk_adjustment_set_value (vadj, bounds.y0);
             }
         }
 
-- 
2.7.4