Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantipov@yandex.ru

[gnu-emacs] / src / gtkutil.c

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 7e7d68d80d4a4a6c0ae7e1f87dec140fcfcf5813..595e6e0bb6ac00acd130f4cd20a08f19dcde3aaa 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -508,16 +508,16 @@ get_utf8_string (const char *str)
              && err->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE)
         {
           memcpy (up, p, bytes_written);
-          sprintf (up + bytes_written, "\\%03o", p[bytes_written]);
-          up += bytes_written+4;
-          p += bytes_written+1;
+          up += bytes_written;
+          up += sprintf (up, "\\%03o", p[bytes_written]);
+          p += bytes_written + 1;
           g_error_free (err);
           err = NULL;
         }
 
       if (cp)
         {
-          strcat (utf8_str, cp);
+          strcpy (up, cp);
           g_free (cp);
         }
       if (err)
@@ -1324,7 +1324,7 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position)
 
   size_hints.base_width = base_width;
   size_hints.base_height = base_height;
-  size_hints.min_width  = base_width + min_cols * FRAME_COLUMN_WIDTH (f);;
+  size_hints.min_width  = base_width + min_cols * FRAME_COLUMN_WIDTH (f);
   size_hints.min_height = base_height + min_rows * FRAME_LINE_HEIGHT (f);
 
   /* These currently have a one to one mapping with the X values, but I
@@ -3993,17 +3993,18 @@ xg_set_toolkit_horizontal_scroll_bar_thumb (struct scroll_bar *bar,
 
       block_input ();
       adj = gtk_range_get_adjustment (GTK_RANGE (wscroll));
-
-      /*      gtk_adjustment_set_lower (adj, (gdouble) lower);
+#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); */
-      gtk_adjustment_configure (adj, (gdouble) value, (gdouble) lower,
-                               (gdouble) upper, (gdouble) step_increment,
-                               (gdouble) page_increment, (gdouble) pagesize);
+      gtk_adjustment_set_step_increment (adj, (gdouble) step_increment);
+#endif
       gtk_adjustment_changed (adj);
       unblock_input ();
     }