Revert GtkScaleButton accesses for plus/minus buttons, as per #539944

svn path=/trunk/; revision=20682

diff --git a/ChangeLog b/ChangeLog
index 67e4f79dd3d1dfd58e35e6b83e51ce26ace0b9a5..7ab658a030347258b6febef7246df67d503a0ed6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -211,13 +211,6 @@
 
        * gtk/gtklayout.c (enum): Remove left-over unused property enum.
 
-       * gtk/gtk.symbols:
-       * gtk/gtkscalebutton.c (gtk_scale_button_get_plus_button),
-       (gtk_scale_button_get_minus_button):
-       * gtk/gtkscalebutton.h:
-       Add missing accessor for sealed fields GtkScaleButton->plus_button and
-       minus_button.
-
 2008-06-20  Johan Dahlin  <jdahlin@async.com.br>
 
        * gtk/gtkscalebutton.c: Fix gtk-doc syntax, add missing trailing colon.

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index a83d1f8fe6500c2345483ed06d7713590d656a7f..8d13a9939e8c9c78c57c963c1c1a6137b16b7256 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -3309,8 +3309,6 @@ gtk_scale_button_set_icons
 gtk_scale_button_set_value
 gtk_scale_button_get_adjustment
 gtk_scale_button_set_adjustment
-gtk_scale_button_get_minus_button
-gtk_scale_button_get_plus_button
 #endif
 #endif
 

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 147f810783cfa53d4e1d239613f3c013d12a8501..afb14cde4341c0cca162cc49f049ee478f073475 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -819,6 +819,7 @@ gtk_container_add_with_properties (GtkContainer *container,
   g_return_if_fail (GTK_IS_CONTAINER (container));
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (widget->parent == NULL);
+  g_return_if_fail (widget->parent == container);
 
   g_object_ref (container);
   g_object_ref (widget);

diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 5d8ef752613a2593686be4881be84d27bd046fe7..7946baa82b6f789b7d09b40248282ad5fd3c1b31 100644 (file)
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -1321,41 +1321,5 @@ gtk_scale_button_scale_value_changed (GtkRange *range)
   g_object_notify (G_OBJECT (button), "value");
 }
  
-/**
- * gtk_scale_button_get_plus_button:
- * @button: a #GtkScaleButton
- *
- * Retrieves the scale buttons plus button widget
- *
- * Return value: the plus button widget
- *
- * Since: 2.14
- */
-GtkWidget*
-gtk_scale_button_get_plus_button (GtkScaleButton *button)
-{
-  g_return_val_if_fail (GTK_IS_SCALE_BUTTON (button), button);
-
-  return button->plus_button;
-}
-
-/**
- * gtk_scale_button_get_minus_button:
- * @button: a #GtkScaleButton
- *
- * Retrieves the scale buttons minus button widget
- *
- * Return value: the minus button widget
- *
- * Since: 2.14
- */
-GtkWidget*
-gtk_scale_button_get_minus_button (GtkScaleButton *button)
-{
-  g_return_val_if_fail (GTK_IS_SCALE_BUTTON (button), button);
-
-  return button->minus_button;
-}
-
 #define __GTK_SCALE_BUTTON_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h
index 9548093b72e00eae98e3cc703bab667b06590f50..7384db05c2c09fbfe4873d477286912a0a64c142 100644 (file)
--- a/gtk/gtkscalebutton.h
+++ b/gtk/gtkscalebutton.h
@@ -95,8 +95,6 @@ void          gtk_scale_button_set_value      (GtkScaleButton *button,
 GtkAdjustment* gtk_scale_button_get_adjustment (GtkScaleButton *button);
 void           gtk_scale_button_set_adjustment (GtkScaleButton *button,
                                                 GtkAdjustment  *adjustment);
-GtkWidget*     gtk_scale_button_get_plus_button (GtkScaleButton *button);
-GtkWidget*     gtk_scale_button_get_minus_button (GtkScaleButton *button);
 
 G_END_DECLS