hmm, someone changed GLib without fixing GTK

2001-02-19  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
	changed GLib without fixing GTK

	* gtk/gtkrange.h: Rename all the stupid implementation detail
	functions to have an underscore in front. Most of them should
	probably just go away, but for starters don't export them.
	Bug #50482

2001-02-19  Havoc Pennington  <hp@redhat.com>

	* gdk-pixbuf-io.c (gdk_pixbuf_load_module): const fix

diff --git a/ChangeLog b/ChangeLog
index edc4d8403fcfa241294bf7d6ed90f40a684adbc7..6d5414893efe022e5e21197ccdbf2d54bffe66ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-19  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+       changed GLib without fixing GTK
+
+       * gtk/gtkrange.h: Rename all the stupid implementation detail 
+       functions to have an underscore in front. Most of them should 
+       probably just go away, but for starters don't export them.
+       Bug #50482
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkcolor.h: test was backward, so deprecated functions were

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index edc4d8403fcfa241294bf7d6ed90f40a684adbc7..6d5414893efe022e5e21197ccdbf2d54bffe66ee 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+2001-02-19  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+       changed GLib without fixing GTK
+
+       * gtk/gtkrange.h: Rename all the stupid implementation detail 
+       functions to have an underscore in front. Most of them should 
+       probably just go away, but for starters don't export them.
+       Bug #50482
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkcolor.h: test was backward, so deprecated functions were

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index edc4d8403fcfa241294bf7d6ed90f40a684adbc7..6d5414893efe022e5e21197ccdbf2d54bffe66ee 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2001-02-19  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+       changed GLib without fixing GTK
+
+       * gtk/gtkrange.h: Rename all the stupid implementation detail 
+       functions to have an underscore in front. Most of them should 
+       probably just go away, but for starters don't export them.
+       Bug #50482
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkcolor.h: test was backward, so deprecated functions were

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index edc4d8403fcfa241294bf7d6ed90f40a684adbc7..6d5414893efe022e5e21197ccdbf2d54bffe66ee 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+2001-02-19  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+       changed GLib without fixing GTK
+
+       * gtk/gtkrange.h: Rename all the stupid implementation detail 
+       functions to have an underscore in front. Most of them should 
+       probably just go away, but for starters don't export them.
+       Bug #50482
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkcolor.h: test was backward, so deprecated functions were

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index edc4d8403fcfa241294bf7d6ed90f40a684adbc7..6d5414893efe022e5e21197ccdbf2d54bffe66ee 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2001-02-19  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+       changed GLib without fixing GTK
+
+       * gtk/gtkrange.h: Rename all the stupid implementation detail 
+       functions to have an underscore in front. Most of them should 
+       probably just go away, but for starters don't export them.
+       Bug #50482
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkcolor.h: test was backward, so deprecated functions were

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index edc4d8403fcfa241294bf7d6ed90f40a684adbc7..6d5414893efe022e5e21197ccdbf2d54bffe66ee 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2001-02-19  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+       changed GLib without fixing GTK
+
+       * gtk/gtkrange.h: Rename all the stupid implementation detail 
+       functions to have an underscore in front. Most of them should 
+       probably just go away, but for starters don't export them.
+       Bug #50482
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkcolor.h: test was backward, so deprecated functions were

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index edc4d8403fcfa241294bf7d6ed90f40a684adbc7..6d5414893efe022e5e21197ccdbf2d54bffe66ee 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2001-02-19  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+       changed GLib without fixing GTK
+
+       * gtk/gtkrange.h: Rename all the stupid implementation detail 
+       functions to have an underscore in front. Most of them should 
+       probably just go away, but for starters don't export them.
+       Bug #50482
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkcolor.h: test was backward, so deprecated functions were

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index c33eb753256fe183c90e693981c09d30dea12741..4ba76e194dc5e270277ec4facc094426d4f27496 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-19  Havoc Pennington  <hp@redhat.com>
+
+       * gdk-pixbuf-io.c (gdk_pixbuf_load_module): const fix
+
 2001-02-17  Havoc Pennington  <hp@pobox.com>
 
        * gdk-pixbuf-loader.c (gdk_pixbuf_loader_new_with_type): docs

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index f6c81af66f3493171cec63ac851d1eb27e59b659..dd7dbd224b32814e3c8ca9df9dc22913f11fbdc9 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -263,7 +263,7 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
        gpointer sym;
        char *name;
         gboolean retval;
-        char *dir;
+        const char *dir;
        
         g_return_val_if_fail (image_module->module == NULL, FALSE);
 

diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index e1fae4f3bd708f32cf58cb093a7238a99d90e724..1976acd52faa32138576a3d3df44f0ac38a4c6ea 100644 (file)
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -118,9 +118,9 @@ gtk_hscale_class_init (GtkHScaleClass *class)
   widget_class->size_request = gtk_hscale_size_request;
   widget_class->size_allocate = gtk_hscale_size_allocate;
   
-  range_class->slider_update = gtk_range_default_hslider_update;
-  range_class->trough_click = gtk_range_default_htrough_click;
-  range_class->motion = gtk_range_default_hmotion;
+  range_class->slider_update = _gtk_range_default_hslider_update;
+  range_class->trough_click = _gtk_range_default_htrough_click;
+  range_class->motion = _gtk_range_default_hmotion;
   range_class->draw_slider = gtk_hscale_draw_slider;
   range_class->trough_keys = gtk_hscale_trough_keys;
   range_class->clear_background = gtk_hscale_clear_background;
@@ -242,7 +242,7 @@ gtk_hscale_realize (GtkWidget *widget)
   gtk_style_set_background (widget->style, range->trough, GTK_STATE_ACTIVE);
   gtk_style_set_background (widget->style, range->slider, GTK_STATE_NORMAL);
   
-  gtk_range_slider_update (GTK_RANGE (widget));
+  _gtk_range_slider_update (GTK_RANGE (widget));
   
   gdk_window_show (range->slider);
 }
@@ -325,7 +325,7 @@ gtk_hscale_size_allocate (GtkWidget     *widget,
       
       gdk_window_move_resize (range->trough, 
                               x, y, width, height);
-      gtk_range_slider_update (GTK_RANGE (widget));
+      _gtk_range_slider_update (GTK_RANGE (widget));
     }
 }
 

diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c
index 228e233f92f4cd901c5393bfc193ab2913d557ac..af806cd0d86903d283065416f06ec231d56ee921 100644 (file)
--- a/gtk/gtkhscrollbar.c
+++ b/gtk/gtkhscrollbar.c
@@ -109,9 +109,9 @@ gtk_hscrollbar_class_init (GtkHScrollbarClass *class)
   range_class->draw_step_forw = gtk_hscrollbar_draw_step_forw;
   range_class->draw_step_back = gtk_hscrollbar_draw_step_back;
   range_class->slider_update = gtk_hscrollbar_slider_update;
-  range_class->trough_click = gtk_range_default_htrough_click;
+  range_class->trough_click = _gtk_range_default_htrough_click;
   range_class->trough_keys = gtk_hscrollbar_trough_keys;
-  range_class->motion = gtk_range_default_hmotion;
+  range_class->motion = _gtk_range_default_hmotion;
 }
 
 static void
@@ -240,7 +240,7 @@ gtk_hscrollbar_realize (GtkWidget *widget)
   range->slider = gdk_window_new (range->trough, &attributes, attributes_mask);
   
   gtk_hscrollbar_calc_slider_size (GTK_HSCROLLBAR (widget));
-  gtk_range_slider_update (GTK_RANGE (widget));
+  _gtk_range_slider_update (GTK_RANGE (widget));
   
   widget->style = gtk_style_attach (widget->style, widget->window);
   
@@ -290,7 +290,7 @@ gtk_hscrollbar_size_allocate (GtkWidget     *widget,
                               RANGE_CLASS (widget)->stepper_size,
                               widget->requisition.height - widget->style->ythickness * 2);
       
-      gtk_range_slider_update (GTK_RANGE (widget));
+      _gtk_range_slider_update (GTK_RANGE (widget));
     }
 }
 
@@ -369,7 +369,7 @@ gtk_hscrollbar_slider_update (GtkRange *range)
   g_return_if_fail (GTK_IS_HSCROLLBAR (range));
   
   gtk_hscrollbar_calc_slider_size (GTK_HSCROLLBAR (range));
-  gtk_range_default_hslider_update (range);
+  _gtk_range_default_hslider_update (range);
 }
 
 static void

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 0f22f1e7420556bf9243bc1af03b90f7fc45c034..76d88cd78a73fd8bf6d865086661d49d092a7179 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -329,7 +329,7 @@ gtk_range_get_inverted (GtkRange *range)
 }
 
 void
-gtk_range_draw_background (GtkRange *range)
+_gtk_range_draw_background (GtkRange *range)
 {
   g_return_if_fail (range != NULL);
   g_return_if_fail (GTK_IS_RANGE (range));
@@ -339,7 +339,7 @@ gtk_range_draw_background (GtkRange *range)
 }
 
 void
-gtk_range_clear_background (GtkRange *range)
+_gtk_range_clear_background (GtkRange *range)
 {
   g_return_if_fail (range != NULL);
   g_return_if_fail (GTK_IS_RANGE (range));
@@ -349,7 +349,7 @@ gtk_range_clear_background (GtkRange *range)
 }
 
 void
-gtk_range_draw_trough (GtkRange *range)
+_gtk_range_draw_trough (GtkRange *range)
 {
   g_return_if_fail (range != NULL);
   g_return_if_fail (GTK_IS_RANGE (range));
@@ -359,7 +359,7 @@ gtk_range_draw_trough (GtkRange *range)
 }
 
 void
-gtk_range_draw_slider (GtkRange *range)
+_gtk_range_draw_slider (GtkRange *range)
 {
   g_return_if_fail (range != NULL);
   g_return_if_fail (GTK_IS_RANGE (range));
@@ -369,7 +369,7 @@ gtk_range_draw_slider (GtkRange *range)
 }
 
 void
-gtk_range_draw_step_forw (GtkRange *range)
+_gtk_range_draw_step_forw (GtkRange *range)
 {
   g_return_if_fail (range != NULL);
   g_return_if_fail (GTK_IS_RANGE (range));
@@ -379,7 +379,7 @@ gtk_range_draw_step_forw (GtkRange *range)
 }
 
 void
-gtk_range_draw_step_back (GtkRange *range)
+_gtk_range_draw_step_back (GtkRange *range)
 {
   g_return_if_fail (range != NULL);
   g_return_if_fail (GTK_IS_RANGE (range));
@@ -389,7 +389,7 @@ gtk_range_draw_step_back (GtkRange *range)
 }
 
 void
-gtk_range_slider_update (GtkRange *range)
+_gtk_range_slider_update (GtkRange *range)
 {
   g_return_if_fail (range != NULL);
   g_return_if_fail (GTK_IS_RANGE (range));
@@ -399,10 +399,10 @@ gtk_range_slider_update (GtkRange *range)
 }
 
 gint
-gtk_range_trough_click (GtkRange *range,
-                       gint      x,
-                       gint      y,
-                       gfloat   *jump_perc)
+_gtk_range_trough_click (GtkRange *range,
+                         gint      x,
+                         gint      y,
+                         gfloat   *jump_perc)
 {
   g_return_val_if_fail (range != NULL, GTK_TROUGH_NONE);
   g_return_val_if_fail (GTK_IS_RANGE (range), GTK_TROUGH_NONE);
@@ -457,7 +457,7 @@ should_invert (GtkRange *range,
 }
 
 void
-gtk_range_default_hslider_update (GtkRange *range)
+_gtk_range_default_hslider_update (GtkRange *range)
 {
   gint left;
   gint right;
@@ -499,7 +499,7 @@ gtk_range_default_hslider_update (GtkRange *range)
 }
 
 void
-gtk_range_default_vslider_update (GtkRange *range)
+_gtk_range_default_vslider_update (GtkRange *range)
 {
   gint top;
   gint bottom;
@@ -541,10 +541,10 @@ gtk_range_default_vslider_update (GtkRange *range)
 }
 
 gint
-gtk_range_default_htrough_click (GtkRange *range,
-                                gint      x,
-                                gint      y,
-                                gfloat   *jump_perc)
+_gtk_range_default_htrough_click (GtkRange *range,
+                                  gint      x,
+                                  gint      y,
+                                  gfloat   *jump_perc)
 {
   gint ythickness;
   gint trough_width;
@@ -590,10 +590,10 @@ gtk_range_default_htrough_click (GtkRange *range,
 }
 
 gint
-gtk_range_default_vtrough_click (GtkRange *range,
-                                gint      x,
-                                gint      y,
-                                gfloat   *jump_perc)
+_gtk_range_default_vtrough_click (GtkRange *range,
+                                  gint      x,
+                                  gint      y,
+                                  gfloat   *jump_perc)
 {
   gint xthickness;
   gint trough_width;
@@ -640,9 +640,9 @@ gtk_range_default_vtrough_click (GtkRange *range,
 }
 
 void
-gtk_range_default_hmotion (GtkRange *range,
-                          gint      xdelta,
-                          gint      ydelta)
+_gtk_range_default_hmotion (GtkRange *range,
+                            gint      xdelta,
+                            gint      ydelta)
 {
   gdouble old_value;
   gint left, right;
@@ -691,8 +691,8 @@ gtk_range_default_hmotion (GtkRange *range,
        }
       else
        {
-         gtk_range_slider_update (range);
-         gtk_range_clear_background (range);
+         _gtk_range_slider_update (range);
+         _gtk_range_clear_background (range);
 
          if (range->policy == GTK_UPDATE_DELAYED)
            {
@@ -706,9 +706,9 @@ gtk_range_default_hmotion (GtkRange *range,
 }
 
 void
-gtk_range_default_vmotion (GtkRange *range,
-                          gint      xdelta,
-                          gint      ydelta)
+_gtk_range_default_vmotion (GtkRange *range,
+                            gint      xdelta,
+                            gint      ydelta)
 {
   gdouble old_value;
   gint top, bottom;
@@ -759,8 +759,8 @@ gtk_range_default_vmotion (GtkRange *range,
        }
       else
        {
-         gtk_range_slider_update (range);
-         gtk_range_clear_background (range);
+         _gtk_range_slider_update (range);
+         _gtk_range_clear_background (range);
 
          if (range->policy == GTK_UPDATE_DELAYED)
            {
@@ -804,7 +804,7 @@ gtk_range_draw_focus (GtkWidget *widget)
   g_return_if_fail (GTK_IS_RANGE (widget));
 
   if (GTK_WIDGET_DRAWABLE (widget))
-    gtk_range_draw_trough (GTK_RANGE (widget));
+    _gtk_range_draw_trough (GTK_RANGE (widget));
 }
 
 static void
@@ -863,23 +863,23 @@ gtk_range_expose (GtkWidget      *widget,
    */
   if (event->window == range->trough)
     {
-      gtk_range_draw_trough (range);
+      _gtk_range_draw_trough (range);
     }
   else if (event->window == widget->window)
     {
-      gtk_range_draw_background (range); 
+      _gtk_range_draw_background (range); 
     }
   else if (event->window == range->slider)
     {
-      gtk_range_draw_slider (range);
+      _gtk_range_draw_slider (range);
     }
   else if (event->window == range->step_forw)
     {
-      gtk_range_draw_step_forw (range);
+      _gtk_range_draw_step_forw (range);
     }
   else if (event->window == range->step_back)
     {
-      gtk_range_draw_step_back (range);
+      _gtk_range_draw_step_back (range);
     }
   return FALSE;
 }
@@ -913,9 +913,9 @@ gtk_range_button_press (GtkWidget      *widget,
          range->click_child = RANGE_CLASS (range)->trough;
          
          if (range->button == 2)
-           trough_part = gtk_range_trough_click (range, event->x, event->y, &jump_perc);
+           trough_part = _gtk_range_trough_click (range, event->x, event->y, &jump_perc);
          else
-           trough_part = gtk_range_trough_click (range, event->x, event->y, NULL);
+           trough_part = _gtk_range_trough_click (range, event->x, event->y, NULL);
          
          range->scroll_type = GTK_SCROLL_NONE;
          if (trough_part == GTK_TROUGH_START)
@@ -964,9 +964,9 @@ gtk_range_button_press (GtkWidget      *widget,
              gtk_range_add_timer (range);
              
              if (back)
-               gtk_range_draw_step_back (range);
+               _gtk_range_draw_step_back (range);
              else
-               gtk_range_draw_step_forw (range);
+               _gtk_range_draw_step_forw (range);
            }
        }
     }
@@ -1015,12 +1015,12 @@ gtk_range_button_release (GtkWidget      *widget,
          if (range->click_child == RANGE_CLASS (range)->step_forw)
            {
              range->click_child = 0;
-             gtk_range_draw_step_forw (range);
+             _gtk_range_draw_step_forw (range);
            }
          else if (range->click_child == RANGE_CLASS (range)->step_back)
            {
              range->click_child = 0;
-             gtk_range_draw_step_back (range);
+             _gtk_range_draw_step_back (range);
            }
        }
 
@@ -1134,38 +1134,38 @@ gtk_range_key_press (GtkWidget   *widget,
                {
                 case GTK_SCROLL_STEP_LEFT:
                   if (should_invert (range, TRUE))
-                    gtk_range_draw_step_forw (range);
+                    _gtk_range_draw_step_forw (range);
                   else
-                    gtk_range_draw_step_back (range);
+                    _gtk_range_draw_step_back (range);
                   break;
                     
                 case GTK_SCROLL_STEP_UP:
                   if (should_invert (range, FALSE))
-                    gtk_range_draw_step_forw (range);
+                    _gtk_range_draw_step_forw (range);
                   else
-                    gtk_range_draw_step_back (range);
+                    _gtk_range_draw_step_back (range);
                   break;
 
                 case GTK_SCROLL_STEP_RIGHT:
                   if (should_invert (range, TRUE))
-                    gtk_range_draw_step_back (range);
+                    _gtk_range_draw_step_back (range);
                   else
-                    gtk_range_draw_step_forw (range);
+                    _gtk_range_draw_step_forw (range);
                   break;
                     
                 case GTK_SCROLL_STEP_DOWN:
                   if (should_invert (range, FALSE))
-                    gtk_range_draw_step_back (range);
+                    _gtk_range_draw_step_back (range);
                   else
-                    gtk_range_draw_step_forw (range);
+                    _gtk_range_draw_step_forw (range);
                   break;
                   
                case GTK_SCROLL_STEP_BACKWARD:
-                 gtk_range_draw_step_back (range);
+                 _gtk_range_draw_step_back (range);
                  break;
                   
                case GTK_SCROLL_STEP_FORWARD:
-                 gtk_range_draw_step_forw (range);
+                 _gtk_range_draw_step_forw (range);
                  break;
                }
            }
@@ -1183,8 +1183,8 @@ gtk_range_key_press (GtkWidget   *widget,
              gtk_signal_emit_by_name (GTK_OBJECT (range->adjustment),
                                       "value_changed");
 
-             gtk_range_slider_update (range);
-             gtk_range_clear_background (range);
+             _gtk_range_slider_update (range);
+             _gtk_range_clear_background (range);
            }
        }
     }
@@ -1212,7 +1212,7 @@ gtk_range_enter_notify (GtkWidget        *widget,
 
       if ((range->click_child == 0) ||
          (range->click_child == RANGE_CLASS (range)->trough))
-       gtk_range_draw_slider (range);
+       _gtk_range_draw_slider (range);
     }
   else if (event->window == range->step_forw)
     {
@@ -1220,7 +1220,7 @@ gtk_range_enter_notify (GtkWidget        *widget,
 
       if ((range->click_child == 0) ||
          (range->click_child == RANGE_CLASS (range)->trough))
-       gtk_range_draw_step_forw (range);
+       _gtk_range_draw_step_forw (range);
     }
   else if (event->window == range->step_back)
     {
@@ -1228,7 +1228,7 @@ gtk_range_enter_notify (GtkWidget        *widget,
 
       if ((range->click_child == 0) ||
          (range->click_child == RANGE_CLASS (range)->trough))
-       gtk_range_draw_step_back (range);
+       _gtk_range_draw_step_back (range);
     }
 
   return TRUE;
@@ -1254,19 +1254,19 @@ gtk_range_leave_notify (GtkWidget        *widget,
     {
       if ((range->click_child == 0) ||
          (range->click_child == RANGE_CLASS (range)->trough))
-       gtk_range_draw_slider (range);
+       _gtk_range_draw_slider (range);
     }
   else if (event->window == range->step_forw)
     {
       if ((range->click_child == 0) ||
          (range->click_child == RANGE_CLASS (range)->trough))
-       gtk_range_draw_step_forw (range);
+       _gtk_range_draw_step_forw (range);
     }
   else if (event->window == range->step_back)
     {
       if ((range->click_child == 0) ||
          (range->click_child == RANGE_CLASS (range)->trough))
-       gtk_range_draw_step_back (range);
+       _gtk_range_draw_step_back (range);
     }
 
   return TRUE;
@@ -1554,8 +1554,8 @@ gtk_range_scroll (GtkRange *range,
        }
       else
        {
-         gtk_range_slider_update (range);
-         gtk_range_clear_background (range);
+         _gtk_range_slider_update (range);
+         _gtk_range_clear_background (range);
        }
     }
 
@@ -1619,8 +1619,8 @@ gtk_range_adjustment_changed (GtkAdjustment *adjustment,
       (range->old_upper != adjustment->upper) ||
       (range->old_page_size != adjustment->page_size))
     {
-      gtk_range_slider_update (range);
-      gtk_range_clear_background (range);
+      _gtk_range_slider_update (range);
+      _gtk_range_clear_background (range);
 
       range->old_value = adjustment->value;
       range->old_lower = adjustment->lower;
@@ -1642,8 +1642,8 @@ gtk_range_adjustment_value_changed (GtkAdjustment *adjustment,
 
   if (range->old_value != adjustment->value)
     {
-      gtk_range_slider_update (range);
-      gtk_range_clear_background (range);
+      _gtk_range_slider_update (range);
+      _gtk_range_clear_background (range);
 
       range->old_value = adjustment->value;
     }

diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 9c3089680b9e166338e77dfbc205350d318166b9..145412ad63918f283b4d360e8887ad7d4769803f 100644 (file)
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -128,34 +128,34 @@ void           gtk_range_set_inverted           (GtkRange      *range,
                                                  gboolean       setting);
 gboolean       gtk_range_get_inverted           (GtkRange      *range);
 
-void           gtk_range_draw_background        (GtkRange      *range);
-void           gtk_range_clear_background       (GtkRange      *range);
-void           gtk_range_draw_trough            (GtkRange      *range);
-void           gtk_range_draw_slider            (GtkRange      *range);
-void           gtk_range_draw_step_forw         (GtkRange      *range);
-void           gtk_range_draw_step_back         (GtkRange      *range);
-void           gtk_range_slider_update          (GtkRange      *range);
-gint           gtk_range_trough_click           (GtkRange      *range,
-                                                gint           x,
-                                                gint           y,
-                                                gfloat        *jump_perc);
-
-void           gtk_range_default_hslider_update (GtkRange      *range);
-void           gtk_range_default_vslider_update (GtkRange      *range);
-gint           gtk_range_default_htrough_click  (GtkRange      *range,
-                                                gint           x,
-                                                gint           y,
-                                                gfloat        *jump_perc);
-gint           gtk_range_default_vtrough_click  (GtkRange      *range,
-                                                gint           x,
-                                                gint           y,
-                                                gfloat        *jump_perc);
-void           gtk_range_default_hmotion        (GtkRange      *range,
-                                                gint           xdelta,
-                                                gint           ydelta);
-void           gtk_range_default_vmotion        (GtkRange      *range,
-                                                gint           xdelta,
-                                                gint           ydelta);
+void           _gtk_range_draw_background        (GtkRange      *range);
+void           _gtk_range_clear_background       (GtkRange      *range);
+void           _gtk_range_draw_trough            (GtkRange      *range);
+void           _gtk_range_draw_slider            (GtkRange      *range);
+void           _gtk_range_draw_step_forw         (GtkRange      *range);
+void           _gtk_range_draw_step_back         (GtkRange      *range);
+void           _gtk_range_slider_update          (GtkRange      *range);
+gint           _gtk_range_trough_click           (GtkRange      *range,
+                                                  gint           x,
+                                                  gint           y,
+                                                  gfloat        *jump_perc);
+
+void           _gtk_range_default_hslider_update (GtkRange      *range);
+void           _gtk_range_default_vslider_update (GtkRange      *range);
+gint           _gtk_range_default_htrough_click  (GtkRange      *range,
+                                                  gint           x,
+                                                  gint           y,
+                                                  gfloat        *jump_perc);
+gint           _gtk_range_default_vtrough_click  (GtkRange      *range,
+                                                  gint           x,
+                                                  gint           y,
+                                                  gfloat        *jump_perc);
+void           _gtk_range_default_hmotion        (GtkRange      *range,
+                                                  gint           xdelta,
+                                                  gint           ydelta);
+void           _gtk_range_default_vmotion        (GtkRange      *range,
+                                                  gint           xdelta,
+                                                  gint           ydelta);
 
 
 #ifdef __cplusplus

diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index b7f99c66da27947c07d27b0f8db4b9c24d6dc5db..cf46b373635f2a3fd464d577e969b9a0abc3bb28 100644 (file)
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -1199,7 +1199,7 @@ gtk_tree_model_get_valist (GtkTreeModel *tree_model,
 
       gtk_tree_model_get_value (GTK_TREE_MODEL (tree_model), iter, column, &value);
 
-      G_VALUE_LCOPY (&value, var_args, &error);
+      G_VALUE_LCOPY (&value, var_args, 0, &error);
       if (error)
        {
          g_warning ("%s: %s", G_STRLOC, error);

diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index b1ee7a2d5b59b69d6e2e33adfc3b0487f820cecf..75dd23d796a7698ca00eb64590373708368cbfcd 100644 (file)
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -119,9 +119,9 @@ gtk_vscale_class_init (GtkVScaleClass *class)
   widget_class->size_request = gtk_vscale_size_request;
   widget_class->size_allocate = gtk_vscale_size_allocate;
   
-  range_class->slider_update = gtk_range_default_vslider_update;
-  range_class->trough_click = gtk_range_default_vtrough_click;
-  range_class->motion = gtk_range_default_vmotion;
+  range_class->slider_update = _gtk_range_default_vslider_update;
+  range_class->trough_click = _gtk_range_default_vtrough_click;
+  range_class->motion = _gtk_range_default_vmotion;
   range_class->draw_slider = gtk_vscale_draw_slider;
   range_class->trough_keys = gtk_vscale_trough_keys;
   range_class->clear_background = gtk_vscale_clear_background;
@@ -241,7 +241,7 @@ gtk_vscale_realize (GtkWidget *widget)
   gtk_style_set_background (widget->style, range->trough, GTK_STATE_ACTIVE);
   gtk_style_set_background (widget->style, range->slider, GTK_STATE_NORMAL);
   
-  gtk_range_slider_update (GTK_RANGE (widget));
+  _gtk_range_slider_update (GTK_RANGE (widget));
   
   gdk_window_show (range->slider);
 }
@@ -326,7 +326,7 @@ gtk_vscale_size_allocate (GtkWidget     *widget,
       gtk_vscale_pos_trough (GTK_VSCALE (widget), &x, &y, &width, &height);
       
       gdk_window_move_resize (range->trough, x, y, width, height);
-      gtk_range_slider_update (GTK_RANGE (widget));
+      _gtk_range_slider_update (GTK_RANGE (widget));
     }
 }
 

diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c
index dadaff7cc72c8a8b3d60438c13ad7f2840c1e4b0..41d0d8630af891193c0309d8a3c1ab5625599971 100644 (file)
--- a/gtk/gtkvscrollbar.c
+++ b/gtk/gtkvscrollbar.c
@@ -109,9 +109,9 @@ gtk_vscrollbar_class_init (GtkVScrollbarClass *class)
   range_class->draw_step_forw = gtk_vscrollbar_draw_step_forw;
   range_class->draw_step_back = gtk_vscrollbar_draw_step_back;
   range_class->slider_update = gtk_vscrollbar_slider_update;
-  range_class->trough_click = gtk_range_default_vtrough_click;
+  range_class->trough_click = _gtk_range_default_vtrough_click;
   range_class->trough_keys = gtk_vscrollbar_trough_keys;
-  range_class->motion = gtk_range_default_vmotion;
+  range_class->motion = _gtk_range_default_vmotion;
 }
 
 static void
@@ -240,7 +240,7 @@ gtk_vscrollbar_realize (GtkWidget *widget)
   range->slider = gdk_window_new (range->trough, &attributes, attributes_mask);
   
   gtk_vscrollbar_calc_slider_size (GTK_VSCROLLBAR (widget));
-  gtk_range_slider_update (GTK_RANGE (widget));
+  _gtk_range_slider_update (GTK_RANGE (widget));
   
   widget->style = gtk_style_attach (widget->style, widget->window);
   
@@ -290,7 +290,7 @@ gtk_vscrollbar_size_allocate (GtkWidget     *widget,
                               widget->requisition.width - widget->style->xthickness * 2,
                               RANGE_CLASS (widget)->stepper_size);
       
-      gtk_range_slider_update (GTK_RANGE (widget));
+      _gtk_range_slider_update (GTK_RANGE (widget));
     }
 }
 
@@ -369,7 +369,7 @@ gtk_vscrollbar_slider_update (GtkRange *range)
   g_return_if_fail (GTK_IS_VSCROLLBAR (range));
   
   gtk_vscrollbar_calc_slider_size (GTK_VSCROLLBAR (range));
-  gtk_range_default_vslider_update (range);
+  _gtk_range_default_vslider_update (range);
 }
 
 static void