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

[Jan D.]

branch: master
commit 0b1d7cd596b9784584812d1bde8aa2d376891cdb
Author: Jan D <address@hidden>
Date:   Sun Nov 23 14:30:52 2014 +0100

    Fixes: debbugs:19149
    
    * gtkutil.c (gtk_adjustment_configure): Don't use 2.14 functions 
(Bug#19149).
---
 src/ChangeLog |    1 +
 src/gtkutil.c |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 50cbc2a..b75b2f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
        * 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).
+       (gtk_adjustment_configure): Don't use 2.14 functions (Bug#19149).
 
 2014-11-22  Glenn Morris  <address@hidden>
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 035e5af..9465d54 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -80,16 +80,16 @@ along with GNU Emacs.  If not, see 
<http://www.gnu.org/licenses/>.  */
 #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);  \
+#define gtk_adjustment_configure(adj, xvalue, xlower,            \
+                                 xupper, xstep_increment,        \
+                                 xpage_increment, xpagesize)     \
+  do {                                                           \
+    adj->lower = xlower;                                         \
+    adj->upper = xupper;                                         \
+    adj->page_size = xpagesize;                                  \
+    gtk_adjustment_set_value (adj, xvalue);                      \
+    adj->page_increment = xpage_increment;                       \
+    adj->step_increment = xstep_increment;                       \
   } while (0)
 #endif /* < Gtk+ 2.14 */