[Emacs-diffs] master 01/01: Fixes: debbugs:19149

[Jan D.]

branch: master
commit 4ad0a308551e02fc8d2d6cf57403888c10ab50ad
Author: Jan D <address@hidden>
Date:   Sun Nov 23 11:57:19 2014 +0100

    Fixes: debbugs:19149
    
    * gtkutil.c (gtk_adjustment_configure): Define for Gtk+ < 2.14.
    (xg_set_toolkit_horizontal_scroll_bar_thumb): Remove wrong version
    check for gtk_adjustment_configure (Bug#19149).
---
 src/ChangeLog |    6 ++++++
 src/gtkutil.c |   23 ++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index a474398..50cbc2a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-23  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (gtk_adjustment_configure): Define for Gtk+ < 2.14.
+       (xg_set_toolkit_horizontal_scroll_bar_thumb): Remove wrong version
+       check for gtk_adjustment_configure (Bug#19149).
+
 2014-11-22  Glenn Morris  <address@hidden>
 
        * Makefile.in (emacs.res): Add dependency on icons/hand.cur.  Use $<.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6db8858..035e5af 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -79,6 +79,20 @@ along with GNU Emacs.  If not, see 
<http://www.gnu.org/licenses/>.  */
 #define remove_submenu(w) gtk_menu_item_remove_submenu ((w))
 #endif
 
+#if ! GTK_CHECK_VERSION (2, 14, 0)
+#define gtk_adjustment_configure(adj, value, lower,           \
+                                 upper, step_increment,       \
+                                 page_increment, pagesize)    \
+  do {                                                        \
+    gtk_adjustment_set_lower (adj, lower);                    \
+    gtk_adjustment_set_upper (adj, upper);                    \
+    gtk_adjustment_set_page_size (adj, pagesize);             \
+    gtk_adjustment_set_value (adj, value);                    \
+    gtk_adjustment_set_page_increment (adj, page_increment);  \
+    gtk_adjustment_set_step_increment (adj, step_increment);  \
+  } while (0)
+#endif /* < Gtk+ 2.14 */
+
 #ifdef HAVE_FREETYPE
 #if GTK_CHECK_VERSION (3, 2, 0)
 #define USE_NEW_GTK_FONT_CHOOSER 1
@@ -3938,18 +3952,9 @@ xg_set_toolkit_horizontal_scroll_bar_thumb (struct 
scroll_bar *bar,
 
       block_input ();
       adj = gtk_range_get_adjustment (GTK_RANGE (wscroll));
-#if GTK_CHECK_VERSION (2, 3, 16)
       gtk_adjustment_configure (adj, (gdouble) value, (gdouble) lower,
                                (gdouble) upper, (gdouble) step_increment,
                                (gdouble) page_increment, (gdouble) pagesize);
-#else
-      gtk_adjustment_set_lower (adj, (gdouble) lower);
-      gtk_adjustment_set_upper (adj, (gdouble) upper);
-      gtk_adjustment_set_page_size (adj, (gdouble) pagesize);
-      gtk_adjustment_set_value (adj, (gdouble) value);
-      gtk_adjustment_set_page_increment (adj, (gdouble) page_increment);
-      gtk_adjustment_set_step_increment (adj, (gdouble) step_increment);
-#endif
       gtk_adjustment_changed (adj);
       unblock_input ();
     }