Add a second volume button.

2007-10-04  Matthias Clasen  <mclasen@redhat.com>

        * tests/testvolumebutton.c: Add a second volume button.

        * gtk/gtkscalebutton.c: Doh, don't release grabs we don't hold.
        (#478371, reported by Bill Nottingham)

svn path=/trunk/; revision=18881

diff --git a/ChangeLog b/ChangeLog
index 95c81afccc14b857de98335995f5cd0d57fbdd0f..34e56e3be633d89453992212c852be4c195e3dee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/testvolumebutton.c: Add a second volume button.
+
+       * gtk/gtkscalebutton.c: Doh, don't release grabs we don't hold.
+       (#478371, reported by Bill Nottingham)
+
 2007-10-04  Loïc Minier  <lool@dooz.org>
 
        * gtk/gtkfilechooserdefault.c: (list_mtime_data_func): Fix warnings

diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 103b8747d62f90daca82b8454e54e4776821ca31..28f6c0101bc866efddeb796fa304f9efb76f514c 100644 (file)
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -877,6 +877,9 @@ gtk_scale_button_grab_notify (GtkScaleButton *button,
 
   priv = button->priv;
 
+  if (!GTK_WIDGET_HAS_GRAB (priv->dock))
+    return;
+
   if (gtk_widget_is_ancestor (gtk_grab_get_current (), priv->dock))
     return;
 

diff --git a/tests/testvolumebutton.c b/tests/testvolumebutton.c
index 3e316ebd21ba57ed69e4fa8f7a14ed40c432d4d3..28ccede8524e3d86c8a3198b03ad2e2577023a0f 100644 (file)
--- a/tests/testvolumebutton.c
+++ b/tests/testvolumebutton.c
@@ -60,15 +60,22 @@ int main (int argc, char **argv)
 {
        GtkWidget *window;
        GtkWidget *button;
+       GtkWidget *button2;
+       GtkWidget *box;
 
        gtk_init (&argc, &argv);
 
        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
        button = gtk_volume_button_new ();
+       button2 = gtk_volume_button_new ();
+       box = gtk_hbox_new (FALSE, 0);      
+  
        g_signal_connect (G_OBJECT (button),
                          "value-changed",
                          G_CALLBACK (value_changed), NULL);
-       gtk_container_add (GTK_CONTAINER (window), button);
+       gtk_container_add (GTK_CONTAINER (window), box);
+       gtk_container_add (GTK_CONTAINER (box), button);
+       gtk_container_add (GTK_CONTAINER (box), button2);
 
        gtk_widget_show_all (window);
        gtk_button_clicked (GTK_BUTTON (button));