[gnome-control-center] sound: Make sound applet work again in fallback



commit 7280f14460a96ae0af5e21982b1d17fbc24ae419
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Mar 30 15:42:28 2011 +0100

    sound: Make sound applet work again in fallback
    
    Seems to work fine without us trying to popdown the dock
    by ourselves.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=646044

 panels/sound/gvc-stream-status-icon.c |   48 ---------------------------------
 1 files changed, 0 insertions(+), 48 deletions(-)
---
diff --git a/panels/sound/gvc-stream-status-icon.c b/panels/sound/gvc-stream-status-icon.c
index 3d9a678..8cf4e13 100644
--- a/panels/sound/gvc-stream-status-icon.c
+++ b/panels/sound/gvc-stream-status-icon.c
@@ -169,7 +169,6 @@ popup_dock (GvcStreamStatusIcon *icon,
 
         gtk_widget_show_all (icon->priv->dock);
 
-
         /* grab focus */
         gtk_grab_add (icon->priv->dock);
 
@@ -340,45 +339,6 @@ popdown_dock (GvcStreamStatusIcon *icon)
         gtk_widget_hide (icon->priv->dock);
 }
 
-/* This is called when the grab is broken for
- * either the dock, or the scale itself */
-static void
-gvc_icon_grab_notify (GvcStreamStatusIcon *icon,
-                      gboolean             was_grabbed)
-{
-        if (was_grabbed != FALSE) {
-                return;
-        }
-
-        if (!gtk_widget_has_grab (icon->priv->dock)) {
-                return;
-        }
-
-        if (gtk_widget_is_ancestor (gtk_grab_get_current (), icon->priv->dock)) {
-                return;
-        }
-
-        popdown_dock (icon);
-}
-
-static void
-on_dock_grab_notify (GtkWidget           *widget,
-                     gboolean             was_grabbed,
-                     GvcStreamStatusIcon *icon)
-{
-        gvc_icon_grab_notify (icon, was_grabbed);
-}
-
-static gboolean
-on_dock_grab_broken_event (GtkWidget           *widget,
-                           gboolean             was_grabbed,
-                           GvcStreamStatusIcon *icon)
-{
-        gvc_icon_grab_notify (icon, FALSE);
-
-        return FALSE;
-}
-
 static gboolean
 on_dock_key_release (GtkWidget           *widget,
                      GdkEventKey         *event,
@@ -668,14 +628,6 @@ gvc_stream_status_icon_constructor (GType                  type,
                           "scroll-event",
                           G_CALLBACK (on_dock_scroll_event),
                           icon);
-        g_signal_connect (icon->priv->dock,
-                          "grab-notify",
-                          G_CALLBACK (on_dock_grab_notify),
-                          icon);
-        g_signal_connect (icon->priv->dock,
-                          "grab-broken-event",
-                          G_CALLBACK (on_dock_grab_broken_event),
-                          icon);
 
         gtk_window_set_decorated (GTK_WINDOW (icon->priv->dock), FALSE);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]