diff --git a/ChangeLog b/ChangeLog
index 8457c7aa02..b734a1d485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-03  Matthias Clasen  <mclasen@redhat.com>
+	
+	Bug 539944 – Add GtkScaleButton API so struct fields can be marked as
+	private
+
+	* gtk/gtk.symbols:
+	* gtk/gtkscalebutton.[hc] (gtk_scale_button_get_popup): Add an
+	accessor for the popup. Patch by Christian Dywan
+
 2008-07-03  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 535498 – Printing demo broken
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index db652d1598..84638857f7 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -3147,6 +3147,7 @@ gtk_scale_button_set_icons
 gtk_scale_button_set_value
 gtk_scale_button_get_adjustment
 gtk_scale_button_get_value
+gtk_scale_button_get_popup
 <SUBSECTION Standard>
 GTK_SCALE_BUTTON
 GTK_IS_SCALE_BUTTON
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index c3d1071524..60ee9720de 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -3311,6 +3311,7 @@ gtk_scale_button_get_adjustment
 gtk_scale_button_set_adjustment
 gtk_scale_button_get_orientation
 gtk_scale_button_set_orientation
+gtk_scale_button_get_popup
 #endif
 #endif
 
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 30ef2608e7..27b34984b8 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -758,6 +758,22 @@ gtk_scale_button_set_orientation (GtkScaleButton *button,
     }
 }
 
+/**
+ * gtk_scale_button_get_popup:
+ * @button: a #GtkScaleButton
+ *
+ * Retrieves the popup of the #GtkScaleButton.
+ *
+ * Since: 2.14
+ */
+GtkWidget*
+gtk_scale_button_get_popup (GtkScaleButton *button)
+{
+  g_return_if_fail (GTK_IS_SCALE_BUTTON (button));
+
+  return button->priv->dock;
+}
+
 /*
  * button callbacks.
  */
diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h
index 5ba1c8bdd1..6ba51b229a 100644
--- a/gtk/gtkscalebutton.h
+++ b/gtk/gtkscalebutton.h
@@ -98,6 +98,7 @@ void             gtk_scale_button_set_adjustment  (GtkScaleButton  *button,
 GtkOrientation   gtk_scale_button_get_orientation (GtkScaleButton  *button);
 void             gtk_scale_button_set_orientation (GtkScaleButton  *button,
                                                    GtkOrientation   orientation);
+GtkWidget *      gtk_scale_button_get_popup      (GtkScaleButton *button);
 
 G_END_DECLS