aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-06-24 18:08:22 +0200
committerJuanma Barranquero2010-06-24 18:08:22 +0200
commit8c079ebbd2bfd2d08b8ddd2c44565bc639efa496 (patch)
tree10b21cebd1c1c4f124a1625b735667fa6e4a3f72
parent04c23739823fecd98cbc06ad627b36e5bd8e482e (diff)
downloademacs-8c079ebbd2bfd2d08b8ddd2c44565bc639efa496.tar.gz
emacs-8c079ebbd2bfd2d08b8ddd2c44565bc639efa496.zip
src/gtkutil.c (xg_update_scrollbar_pos): Avoid C99 mid-block variable declaration.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/gtkutil.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b52d6c1dffe..9777ab2202b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-06-24 Juanma Barranquero <lekktu@gmail.com>
2
3 * gtkutil.c (xg_update_scrollbar_pos):
4 Avoid C99 mid-block variable declaration.
5
12010-06-22 Jan Djärv <jan.h.d@swipnet.se> 62010-06-22 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * xterm.c (x_scroll_bar_create): Remove call to xg_show_scroll_bar. 8 * xterm.c (x_scroll_bar_create): Remove call to xg_show_scroll_bar.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 51b1c64c108..5774332c676 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3213,6 +3213,7 @@ xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height)
3213 GtkWidget *wfixed = f->output_data.x->edit_widget; 3213 GtkWidget *wfixed = f->output_data.x->edit_widget;
3214 GtkWidget *wparent = gtk_widget_get_parent (wscroll); 3214 GtkWidget *wparent = gtk_widget_get_parent (wscroll);
3215 GtkFixed *wf = GTK_FIXED (wfixed); 3215 GtkFixed *wf = GTK_FIXED (wfixed);
3216 gint msl;
3216 3217
3217 /* Clear out old position. */ 3218 /* Clear out old position. */
3218 GList *iter; 3219 GList *iter;
@@ -3232,7 +3233,6 @@ xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height)
3232 3233
3233 /* Move and resize to new values. */ 3234 /* Move and resize to new values. */
3234 gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top); 3235 gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top);
3235 gint msl;
3236 gtk_widget_style_get (wscroll, "min-slider-length", &msl, NULL); 3236 gtk_widget_style_get (wscroll, "min-slider-length", &msl, NULL);
3237 if (msl > height) 3237 if (msl > height)
3238 { 3238 {