* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to

get GtkAdjustment as widget now is a GtkRange.

* gtkutil.c (xg_create_scroll_bar): Connect to value-changed on
GtkRange to avoid memory leak.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6b03c4936c6ff1a7f36dd3df264177efcefa8eab..286338b9fb2974c3115ab01692efbfec5f2d409a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-09  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
+       get GtkAdjustment as widget now is a GtkRange.
+
+       * gtkutil.c (xg_create_scroll_bar): Connect to value-changed on
+       GtkRange to avoid memory leak.
+
 2003-04-09  Kenichi Handa  <handa@m17n.org>
 
        * xfaces.c (Vface_font_rescale_alist): New variable.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 126cfc73cab52b7aeb44ae06184a2465260c1015..fee560c20b4fa5818d8512df30cac2b486495494 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2512,25 +2512,25 @@ xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name)
 
   scroll_id = xg_store_widget_in_map (wscroll);
 
-  g_signal_connect (G_OBJECT (vadj),
+  g_signal_connect (G_OBJECT (wscroll),
                     "value-changed",
                     scroll_callback,
-                    (gpointer)bar);
+                    (gpointer) bar);
   g_signal_connect (G_OBJECT (wscroll),
                     "destroy",
                     G_CALLBACK (xg_gtk_scroll_destroy),
-                    (gpointer)scroll_id);
+                    (gpointer) scroll_id);
 
   /* Connect to button press and button release to detect if any scroll bar
      has the pointer.  */
   g_signal_connect (G_OBJECT (wscroll),
                     "button-press-event",
                     G_CALLBACK (scroll_bar_button_cb),
-                    (gpointer)bar);
+                    (gpointer) bar);
   g_signal_connect (G_OBJECT (wscroll),
                     "button-release-event",
                     G_CALLBACK (scroll_bar_button_cb),
-                    (gpointer)bar);
+                    (gpointer) bar);
 
   gtk_fixed_put (GTK_FIXED (f->output_data.x->edit_widget),
                  wscroll, -1, -1);

diff --git a/src/xterm.c b/src/xterm.c
index fc68c7b57d8500e25fbd5ef37553621343cf105e..635fe3f28e4a3e6fea0bd440a6084cf283ee0e35 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4190,11 +4190,11 @@ xm_scroll_callback (widget, client_data, call_data)
 #else /* !USE_MOTIF, i.e. Xaw or GTK */
 #ifdef USE_GTK
 /* Scroll bar callback for GTK scroll bars.  WIDGET is the scroll
-   bar adjustment widget.  DATA is a pointer to the scroll_bar structure. */
+   bar widget.  DATA is a pointer to the scroll_bar structure. */
 
 static void
 xg_scroll_callback (widget, data)
-     GtkWidget *widget;
+     GtkRange *widget;
      gpointer data;
 {
   struct scroll_bar *bar = (struct scroll_bar *) data;
@@ -4204,7 +4204,7 @@ xg_scroll_callback (widget, data)
   int diff;
 
   int part = -1, whole = 0, portion = 0;
-  GtkAdjustment *adj = GTK_ADJUSTMENT (widget);
+  GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_range_get_adjustment (widget));
 
   if (xg_ignore_gtk_scrollbar) return;