Move some files and directories to better locations

- mate-volume-control/data changed to /data
- mate-volume-control/src/* moved to mate-volume-control
- sound-theme/sounds changed to /data/sounds
- sound-theme/*.{c,h} moved to mate-volume-control
- Removed AUTHORS and ChangeLog.pre-2-26 from mate-volume-control

1 files changed, 0 insertions, 805 deletions

diff --git a/mate-volume-control/src/gvc-stream-status-icon.c b/mate-volume-control/src/gvc-stream-status-icon.c
deleted file mode 100644
index 3ede4b1..0000000
--- a/mate-volume-control/src/gvc-stream-status-icon.c
+++ /dev/null
@@ -1,805 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2008 William Jon McCann
- * Copyright (C) 2014 Michal Ratajsky <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include <libmatemixer/matemixer.h>
-
-#define MATE_DESKTOP_USE_UNSTABLE_API
-#include <libmate-desktop/mate-desktop-utils.h>
-
-#include "gvc-channel-bar.h"
-#include "gvc-stream-status-icon.h"
-
-#define GVC_STREAM_STATUS_ICON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_STREAM_STATUS_ICON, GvcStreamStatusIconPrivate))
-
-struct _GvcStreamStatusIconPrivate
-{
-        gchar          **icon_names;
-        GtkWidget       *dock;
-        GtkWidget       *bar;
-        guint            current_icon;
-        gchar           *display_name;
-        MateMixerStreamControl *control;
-};
-
-enum
-{
-        PROP_0,
-        PROP_CONTROL,
-        PROP_DISPLAY_NAME,
-        PROP_ICON_NAMES,
-        N_PROPERTIES
-};
-
-static GParamSpec *properties[N_PROPERTIES] = { NULL, };
-
-static void gvc_stream_status_icon_class_init (GvcStreamStatusIconClass *klass);
-static void gvc_stream_status_icon_init       (GvcStreamStatusIcon      *stream_status_icon);
-static void gvc_stream_status_icon_finalize   (GObject                  *object);
-
-G_DEFINE_TYPE (GvcStreamStatusIcon, gvc_stream_status_icon, GTK_TYPE_STATUS_ICON)
-
-static gboolean
-popup_dock (GvcStreamStatusIcon *icon, guint time)
-{
-        GdkRectangle   area;
-        GtkOrientation orientation;
-        GdkDisplay    *display;
-        GdkScreen     *screen;
-        int            x;
-        int            y;
-        int            monitor_num;
-        GdkRectangle   monitor;
-        GtkRequisition dock_req;
-
-        screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon));
-
-        if (gtk_status_icon_get_geometry (GTK_STATUS_ICON (icon),
-                                          &screen,
-                                          &area,
-                                          &orientation) == FALSE) {
-                g_warning ("Unable to determine geometry of status icon");
-                return FALSE;
-        }
-
-        /* position roughly */
-        gtk_window_set_screen (GTK_WINDOW (icon->priv->dock), screen);
-        gvc_channel_bar_set_orientation (GVC_CHANNEL_BAR (icon->priv->bar),
-                                         1 - orientation);
-
-        monitor_num = gdk_screen_get_monitor_at_point (screen, area.x, area.y);
-        gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
-
-        gtk_container_foreach (GTK_CONTAINER (icon->priv->dock),
-                               (GtkCallback) gtk_widget_show_all, NULL);
-#if GTK_CHECK_VERSION (3, 0, 0)
-        gtk_widget_get_preferred_size (icon->priv->dock, &dock_req, NULL);
-#else
-        gtk_widget_size_request (icon->priv->dock, &dock_req);
-#endif
-
-        if (orientation == GTK_ORIENTATION_VERTICAL) {
-                if (area.x + area.width + dock_req.width <= monitor.x + monitor.width)
-                        x = area.x + area.width;
-                else
-                        x = area.x - dock_req.width;
-
-                if (area.y + dock_req.height <= monitor.y + monitor.height)
-                        y = area.y;
-                else
-                        y = monitor.y + monitor.height - dock_req.height;
-        } else {
-                if (area.y + area.height + dock_req.height <= monitor.y + monitor.height)
-                        y = area.y + area.height;
-                else
-                        y = area.y - dock_req.height;
-
-                if (area.x + dock_req.width <= monitor.x + monitor.width)
-                        x = area.x;
-                else
-                        x = monitor.x + monitor.width - dock_req.width;
-        }
-
-        gtk_window_move (GTK_WINDOW (icon->priv->dock), x, y);
-
-        /* Without this, the popup window appears as a square after changing
-         * the orientation */
-        gtk_window_resize (GTK_WINDOW (icon->priv->dock), 1, 1);
-
-        gtk_widget_show_all (icon->priv->dock);
-
-        /* Grab focus */
-        gtk_grab_add (icon->priv->dock);
-
-        display = gtk_widget_get_display (icon->priv->dock);
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-        do {
-                GdkDeviceManager *manager = gdk_display_get_device_manager (display);
-
-                if (gdk_device_grab (gdk_device_manager_get_client_pointer (manager),
-                                     gtk_widget_get_window (icon->priv->dock),
-                                     GDK_OWNERSHIP_NONE,
-                                     TRUE,
-                                     GDK_BUTTON_PRESS_MASK |
-                                     GDK_BUTTON_RELEASE_MASK |
-                                     GDK_POINTER_MOTION_MASK |
-                                     GDK_SCROLL_MASK,
-                                     NULL,
-                                     time) != GDK_GRAB_SUCCESS) {
-                        gtk_grab_remove (icon->priv->dock);
-                        gtk_widget_hide (icon->priv->dock);
-                }
-        } while (0);
-#else
-        if (gdk_pointer_grab (gtk_widget_get_window (icon->priv->dock),
-                              TRUE,
-                              GDK_BUTTON_PRESS_MASK |
-                              GDK_BUTTON_RELEASE_MASK |
-                              GDK_POINTER_MOTION_MASK |
-                              GDK_SCROLL_MASK,
-                              NULL, NULL,
-                              time) != GDK_GRAB_SUCCESS) {
-                gtk_grab_remove (icon->priv->dock);
-                gtk_widget_hide (icon->priv->dock);
-                return FALSE;
-        }
-
-        if (gdk_keyboard_grab (gtk_widget_get_window (icon->priv->dock),
-                               TRUE,
-                               time) != GDK_GRAB_SUCCESS) {
-                gdk_display_pointer_ungrab (display, time);
-                gtk_grab_remove (icon->priv->dock);
-                gtk_widget_hide (icon->priv->dock);
-                return FALSE;
-        }
-#endif
-        gtk_widget_grab_focus (icon->priv->dock);
-
-        return TRUE;
-}
-
-static void
-on_status_icon_activate (GtkStatusIcon *status_icon, GvcStreamStatusIcon *icon)
-{
-        popup_dock (icon, GDK_CURRENT_TIME);
-}
-
-static gboolean
-on_status_icon_button_press (GtkStatusIcon       *status_icon,
-                             GdkEventButton      *event,
-                             GvcStreamStatusIcon *icon)
-{
-        /* Middle click acts as mute/unmute */
-        if (event->button == 2) {
-                gboolean is_muted = mate_mixer_stream_control_get_mute (icon->priv->control);
-
-                mate_mixer_stream_control_set_mute (icon->priv->control, !is_muted);
-                return TRUE;
-        }
-        return FALSE;
-}
-
-static void
-on_menu_mute_toggled (GtkMenuItem *item, GvcStreamStatusIcon *icon)
-{
-        gboolean is_muted;
-
-        is_muted = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item));
-
-        mate_mixer_stream_control_set_mute (icon->priv->control, is_muted);
-}
-
-static void
-on_menu_activate_open_volume_control (GtkMenuItem         *item,
-                                      GvcStreamStatusIcon *icon)
-{
-        GError *error = NULL;
-
-        mate_gdk_spawn_command_line_on_screen (gtk_widget_get_screen (icon->priv->dock),
-                                               "mate-volume-control",
-                                               &error);
-
-        if (error != NULL) {
-                GtkWidget *dialog;
-
-                dialog = gtk_message_dialog_new (NULL,
-                                                 0,
-                                                 GTK_MESSAGE_ERROR,
-                                                 GTK_BUTTONS_CLOSE,
-                                                 _("Failed to start Sound Preferences: %s"),
-                                                 error->message);
-                g_signal_connect (G_OBJECT (dialog),
-                                  "response",
-                                  G_CALLBACK (gtk_widget_destroy),
-                                  NULL);
-                gtk_widget_show (dialog);
-                g_error_free (error);
-        }
-}
-
-static void
-on_status_icon_popup_menu (GtkStatusIcon       *status_icon,
-                           guint                button,
-                           guint                activate_time,
-                           GvcStreamStatusIcon *icon)
-{
-        GtkWidget *menu;
-        GtkWidget *item;
-
-        menu = gtk_menu_new ();
-        item = gtk_check_menu_item_new_with_mnemonic (_("_Mute"));
-
-        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
-                                        mate_mixer_stream_control_get_mute (icon->priv->control));
-        g_signal_connect (G_OBJECT (item),
-                          "toggled",
-                          G_CALLBACK (on_menu_mute_toggled),
-                          icon);
-
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-#if GTK_CHECK_VERSION (3, 10, 0)
-        item = gtk_menu_item_new_with_mnemonic (_("_Sound Preferences"));
-#else
-        item = gtk_image_menu_item_new_with_mnemonic (_("_Sound Preferences"));
-
-        do {
-                GtkWidget *image;
-
-                image = gtk_image_new_from_icon_name ("multimedia-volume-control",
-                                                      GTK_ICON_SIZE_MENU);
-
-                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-        } while (0);
-#endif
-        g_signal_connect (G_OBJECT (item),
-                          "activate",
-                          G_CALLBACK (on_menu_activate_open_volume_control),
-                          icon);
-
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-        gtk_widget_show_all (menu);
-        gtk_menu_popup (GTK_MENU (menu),
-                        NULL,
-                        NULL,
-                        gtk_status_icon_position_menu,
-                        status_icon,
-                        button,
-                        activate_time);
-}
-
-static gboolean
-on_status_icon_scroll_event (GtkStatusIcon       *status_icon,
-                             GdkEventScroll      *event,
-                             GvcStreamStatusIcon *icon)
-{
-        return gvc_channel_bar_scroll (GVC_CHANNEL_BAR (icon->priv->bar), event->direction);
-}
-
-static void
-gvc_icon_release_grab (GvcStreamStatusIcon *icon, GdkEventButton *event)
-{
-#if GTK_CHECK_VERSION (3, 0, 0)
-        gdk_device_ungrab (event->device, event->time);
-#else
-        GdkDisplay *display;
-
-        display = gtk_widget_get_display (GTK_WIDGET (icon->priv->dock));
-
-        gdk_display_keyboard_ungrab (display, event->time);
-        gdk_display_pointer_ungrab (display, event->time);
-#endif
-        gtk_grab_remove (icon->priv->dock);
-
-        /* Hide again */
-        gtk_widget_hide (icon->priv->dock);
-}
-
-static gboolean
-on_dock_button_press (GtkWidget           *widget,
-                      GdkEventButton      *event,
-                      GvcStreamStatusIcon *icon)
-{
-        if (event->type == GDK_BUTTON_PRESS) {
-                gvc_icon_release_grab (icon, event);
-                return TRUE;
-        }
-
-        return FALSE;
-}
-
-static void
-popdown_dock (GvcStreamStatusIcon *icon)
-{
-        GdkDisplay *display;
-
-        display = gtk_widget_get_display (icon->priv->dock);
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-        GdkDeviceManager *manager = gdk_display_get_device_manager (display);
-
-        gdk_device_ungrab (gdk_device_manager_get_client_pointer (manager),
-                           GDK_CURRENT_TIME);
-#else
-        gdk_display_keyboard_ungrab (display, GDK_CURRENT_TIME);
-        gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
-        gtk_grab_remove (icon->priv->dock);
-#endif
-        /* Hide again */
-        gtk_widget_hide (icon->priv->dock);
-}
-
-/* This is called when the grab is broken for either the dock, or the scale */
-static void
-gvc_icon_grab_notify (GvcStreamStatusIcon *icon, gboolean was_grabbed)
-{
-        if (was_grabbed != FALSE)
-                return;
-
-        if (gtk_widget_has_grab (icon->priv->dock) == FALSE)
-                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,
-                     GvcStreamStatusIcon *icon)
-{
-        if (event->keyval == GDK_KEY_Escape) {
-                popdown_dock (icon);
-                return TRUE;
-        }
-        return TRUE;
-}
-
-static gboolean
-on_dock_scroll_event (GtkWidget           *widget,
-                      GdkEventScroll      *event,
-                      GvcStreamStatusIcon *icon)
-{
-        /* Forward event to the status icon */
-        on_status_icon_scroll_event (NULL, event, icon);
-        return TRUE;
-}
-
-static void
-update_icon (GvcStreamStatusIcon *icon)
-{
-        guint                volume = 0;
-        gdouble              decibel = 0;
-        guint                normal = 0;
-        gboolean             muted = FALSE;
-        guint                n = 0;
-        gchar               *markup;
-        const gchar         *description;
-        MateMixerStreamControlFlags flags;
-
-        if (icon->priv->control == NULL) {
-                /* Do not bother creating a tooltip for an unusable icon as it
-                 * has no practical use */
-                gtk_status_icon_set_has_tooltip (GTK_STATUS_ICON (icon), FALSE);
-                return;
-        } else
-                gtk_status_icon_set_has_tooltip (GTK_STATUS_ICON (icon), TRUE);
-
-        flags = mate_mixer_stream_control_get_flags (icon->priv->control);
-
-        if (flags & MATE_MIXER_STREAM_CONTROL_MUTE_READABLE)
-                muted = mate_mixer_stream_control_get_mute (icon->priv->control);
-
-        if (flags & MATE_MIXER_STREAM_CONTROL_VOLUME_READABLE) {
-                volume = mate_mixer_stream_control_get_volume (icon->priv->control);
-                normal = mate_mixer_stream_control_get_normal_volume (icon->priv->control);
-
-                /* Select an icon, they are expected to be sorted, the lowest index being
-                 * the mute icon and the rest being volume increments */
-                if (volume <= 0 || muted)
-                        n = 0;
-                else
-                        n = CLAMP (3 * volume / normal + 1, 1, 3);
-        }
-        if (flags & MATE_MIXER_STREAM_CONTROL_HAS_DECIBEL)
-                decibel = mate_mixer_stream_control_get_decibel (icon->priv->control);
-
-        /* Apparently status icon will reset icon even if it doesn't change */
-        if (icon->priv->current_icon != n) {
-                gtk_status_icon_set_from_icon_name (GTK_STATUS_ICON (icon),
-                                                    icon->priv->icon_names[n]);
-                icon->priv->current_icon = n;
-        }
-
-        description = mate_mixer_stream_control_get_label (icon->priv->control);
-
-        if (muted) {
-                markup = g_strdup_printf ("<b>%s: %s</b>\n<small>%s</small>",
-                                          icon->priv->display_name,
-                                          _("Muted"),
-                                          description);
-        } else if (flags & MATE_MIXER_STREAM_CONTROL_VOLUME_READABLE) {
-                gdouble display_volume = 100 * volume / normal;
-
-                if (flags & MATE_MIXER_STREAM_CONTROL_HAS_DECIBEL) {
-                        if (decibel > -MATE_MIXER_INFINITY) {
-                                markup = g_strdup_printf ("<b>%s: %.0f%%</b>\n"
-                                                          "<small>%0.2f dB\n%s</small>",
-                                                          icon->priv->display_name,
-                                                          display_volume,
-                                                          decibel,
-                                                          description);
-                        } else {
-                                markup = g_strdup_printf ("<b>%s: %.0f%%</b>\n"
-                                                          "<small>-&#8734; dB\n%s</small>",
-                                                          icon->priv->display_name,
-                                                          display_volume,
-                                                          description);
-                        }
-                } else {
-                        markup = g_strdup_printf ("<b>%s: %.0f%%</b>\n<small>%s</small>",
-                                                  icon->priv->display_name,
-                                                  display_volume,
-                                                  description);
-                }
-        } else {
-                markup = g_strdup_printf ("<b>%s</b>\n<small>%s</small>",
-                                          icon->priv->display_name,
-                                          description);
-        }
-
-        gtk_status_icon_set_tooltip_markup (GTK_STATUS_ICON (icon), markup);
-
-        g_free (markup);
-}
-
-void
-gvc_stream_status_icon_set_icon_names (GvcStreamStatusIcon  *icon,
-                                       const gchar         **names)
-{
-        g_return_if_fail (GVC_IS_STREAM_STATUS_ICON (icon));
-        g_return_if_fail (names != NULL && *names != NULL);
-
-        if (G_UNLIKELY (g_strv_length ((gchar **) names) != 4)) {
-                g_warn_if_reached ();
-                return;
-        }
-
-        g_strfreev (icon->priv->icon_names);
-
-        icon->priv->icon_names = g_strdupv ((gchar **) names);
-
-        /* Set the first icon as the initial one, the icon may be immediately
-         * updated or not depending on whether a stream is available */
-        gtk_status_icon_set_from_icon_name (GTK_STATUS_ICON (icon), names[0]);
-        update_icon (icon);
-
-        g_object_notify_by_pspec (G_OBJECT (icon), properties[PROP_ICON_NAMES]);
-}
-
-static void
-on_stream_control_volume_notify (MateMixerStreamControl     *control,
-                         GParamSpec          *pspec,
-                         GvcStreamStatusIcon *icon)
-{
-        update_icon (icon);
-}
-
-static void
-on_stream_control_mute_notify (MateMixerStreamControl     *control,
-                       GParamSpec          *pspec,
-                       GvcStreamStatusIcon *icon)
-{
-        update_icon (icon);
-}
-
-void
-gvc_stream_status_icon_set_display_name (GvcStreamStatusIcon *icon,
-                                         const gchar         *name)
-{
-        g_return_if_fail (GVC_STREAM_STATUS_ICON (icon));
-
-        g_free (icon->priv->display_name);
-
-        icon->priv->display_name = g_strdup (name);
-        update_icon (icon);
-
-        g_object_notify_by_pspec (G_OBJECT (icon), properties[PROP_DISPLAY_NAME]);
-}
-
-void
-gvc_stream_status_icon_set_control (GvcStreamStatusIcon    *icon,
-                                    MateMixerStreamControl *control)
-{
-        g_return_if_fail (GVC_STREAM_STATUS_ICON (icon));
-
-        if (icon->priv->control == control)
-                return;
-
-        if (control != NULL)
-                g_object_ref (control);
-
-        if (icon->priv->control != NULL) {
-                g_signal_handlers_disconnect_by_func (G_OBJECT (icon->priv->control),
-                                                      G_CALLBACK (on_stream_control_volume_notify),
-                                                      icon);
-                g_signal_handlers_disconnect_by_func (G_OBJECT (icon->priv->control),
-                                                      G_CALLBACK (on_stream_control_mute_notify),
-                                                      icon);
-
-                g_object_unref (icon->priv->control);
-        }
-
-        icon->priv->control = control;
-
-        if (icon->priv->control != NULL) {
-                g_signal_connect (G_OBJECT (icon->priv->control),
-                                  "notify::volume",
-                                  G_CALLBACK (on_stream_control_volume_notify),
-                                  icon);
-                g_signal_connect (G_OBJECT (icon->priv->control),
-                                  "notify::mute",
-                                  G_CALLBACK (on_stream_control_mute_notify),
-                                  icon);
-
-                // XXX when no stream set some default icon and "unset" dock
-                update_icon (icon);
-        }
-
-        gvc_channel_bar_set_control (GVC_CHANNEL_BAR (icon->priv->bar), icon->priv->control);
-
-        g_object_notify_by_pspec (G_OBJECT (icon), properties[PROP_CONTROL]);
-}
-
-static void
-gvc_stream_status_icon_set_property (GObject       *object,
-                                     guint          prop_id,
-                                     const GValue  *value,
-                                     GParamSpec    *pspec)
-{
-        GvcStreamStatusIcon *self = GVC_STREAM_STATUS_ICON (object);
-
-        switch (prop_id) {
-        case PROP_CONTROL:
-                gvc_stream_status_icon_set_control (self, g_value_get_object (value));
-                break;
-        case PROP_DISPLAY_NAME:
-                gvc_stream_status_icon_set_display_name (self, g_value_get_string (value));
-                break;
-        case PROP_ICON_NAMES:
-                gvc_stream_status_icon_set_icon_names (self, g_value_get_boxed (value));
-                break;
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-                break;
-        }
-}
-
-static void
-gvc_stream_status_icon_get_property (GObject     *object,
-                                     guint        prop_id,
-                                     GValue      *value,
-                                     GParamSpec  *pspec)
-{
-        GvcStreamStatusIcon *self = GVC_STREAM_STATUS_ICON (object);
-
-        switch (prop_id) {
-        case PROP_CONTROL:
-                g_value_set_object (value, self->priv->control);
-                break;
-        case PROP_DISPLAY_NAME:
-                g_value_set_string (value, self->priv->display_name);
-                break;
-        case PROP_ICON_NAMES:
-                g_value_set_boxed (value, self->priv->icon_names);
-                break;
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-                break;
-        }
-}
-
-static void
-gvc_stream_status_icon_dispose (GObject *object)
-{
-        GvcStreamStatusIcon *icon = GVC_STREAM_STATUS_ICON (object);
-
-        if (icon->priv->dock != NULL) {
-                gtk_widget_destroy (icon->priv->dock);
-                icon->priv->dock = NULL;
-        }
-
-        g_clear_object (&icon->priv->control);
-
-        G_OBJECT_CLASS (gvc_stream_status_icon_parent_class)->dispose (object);
-}
-
-static void
-gvc_stream_status_icon_class_init (GvcStreamStatusIconClass *klass)
-{
-        GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-        object_class->finalize = gvc_stream_status_icon_finalize;
-        object_class->dispose  = gvc_stream_status_icon_dispose;
-        object_class->set_property = gvc_stream_status_icon_set_property;
-        object_class->get_property = gvc_stream_status_icon_get_property;
-
-        properties[PROP_CONTROL] =
-                g_param_spec_object ("control",
-                                     "Control",
-                                     "MateMixer stream control",
-                                     MATE_MIXER_TYPE_STREAM_CONTROL,
-                                     G_PARAM_READWRITE |
-                                     G_PARAM_CONSTRUCT |
-                                     G_PARAM_STATIC_STRINGS);
-
-        properties[PROP_DISPLAY_NAME] =
-                g_param_spec_string ("display-name",
-                                     "Display name",
-                                     "Name to display for this stream",
-                                     NULL,
-                                     G_PARAM_READWRITE |
-                                     G_PARAM_CONSTRUCT |
-                                     G_PARAM_STATIC_STRINGS);
-
-        properties[PROP_ICON_NAMES] =
-                g_param_spec_boxed ("icon-names",
-                                    "Icon names",
-                                    "Name of icon to display for this stream",
-                                    G_TYPE_STRV,
-                                    G_PARAM_READWRITE |
-                                    G_PARAM_CONSTRUCT |
-                                    G_PARAM_STATIC_STRINGS);
-
-        g_object_class_install_properties (object_class, N_PROPERTIES, properties);
-
-        g_type_class_add_private (klass, sizeof (GvcStreamStatusIconPrivate));
-}
-
-static void
-on_status_icon_visible_notify (GvcStreamStatusIcon *icon)
-{
-        if (gtk_status_icon_get_visible (GTK_STATUS_ICON (icon)) == FALSE)
-                gtk_widget_hide (icon->priv->dock);
-}
-
-static void
-gvc_stream_status_icon_init (GvcStreamStatusIcon *icon)
-{
-        GtkWidget *frame;
-        GtkWidget *box;
-
-        icon->priv = GVC_STREAM_STATUS_ICON_GET_PRIVATE (icon);
-
-        g_signal_connect (G_OBJECT (icon),
-                          "activate",
-                          G_CALLBACK (on_status_icon_activate),
-                          icon);
-        g_signal_connect (G_OBJECT (icon),
-                          "button-press-event",
-                          G_CALLBACK (on_status_icon_button_press),
-                          icon);
-        g_signal_connect (G_OBJECT (icon),
-                          "popup-menu",
-                          G_CALLBACK (on_status_icon_popup_menu),
-                          icon);
-        g_signal_connect (G_OBJECT (icon),
-                          "scroll-event",
-                          G_CALLBACK (on_status_icon_scroll_event),
-                          icon);
-        g_signal_connect (G_OBJECT (icon),
-                          "notify::visible",
-                          G_CALLBACK (on_status_icon_visible_notify),
-                          NULL);
-
-        /* Create the dock window */
-        icon->priv->dock = gtk_window_new (GTK_WINDOW_POPUP);
-
-        gtk_window_set_decorated (GTK_WINDOW (icon->priv->dock), FALSE);
-
-        g_signal_connect (G_OBJECT (icon->priv->dock),
-                          "button-press-event",
-                          G_CALLBACK (on_dock_button_press),
-                          icon);
-        g_signal_connect (G_OBJECT (icon->priv->dock),
-                          "key-release-event",
-                          G_CALLBACK (on_dock_key_release),
-                          icon);
-        g_signal_connect (G_OBJECT (icon->priv->dock),
-                          "scroll-event",
-                          G_CALLBACK (on_dock_scroll_event),
-                          icon);
-        g_signal_connect (G_OBJECT (icon->priv->dock),
-                          "grab-notify",
-                          G_CALLBACK (on_dock_grab_notify),
-                          icon);
-        g_signal_connect (G_OBJECT (icon->priv->dock),
-                          "grab-broken-event",
-                          G_CALLBACK (on_dock_grab_broken_event),
-                          icon);
-
-        frame = gtk_frame_new (NULL);
-        gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-        gtk_container_add (GTK_CONTAINER (icon->priv->dock), frame);
-
-        icon->priv->bar = gvc_channel_bar_new (NULL);
-
-        gvc_channel_bar_set_orientation (GVC_CHANNEL_BAR (icon->priv->bar),
-                                         GTK_ORIENTATION_VERTICAL);
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-        box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-#else
-        box = gtk_vbox_new (FALSE, 6);
-#endif
-
-        gtk_container_set_border_width (GTK_CONTAINER (box), 2);
-        gtk_container_add (GTK_CONTAINER (frame), box);
-
-        gtk_box_pack_start (GTK_BOX (box), icon->priv->bar, TRUE, FALSE, 0);
-}
-
-static void
-gvc_stream_status_icon_finalize (GObject *object)
-{
-        GvcStreamStatusIcon *icon;
-
-        icon = GVC_STREAM_STATUS_ICON (object);
-
-        g_strfreev (icon->priv->icon_names);
-
-        G_OBJECT_CLASS (gvc_stream_status_icon_parent_class)->finalize (object);
-}
-
-GvcStreamStatusIcon *
-gvc_stream_status_icon_new (MateMixerStreamControl *control,
-                            const gchar           **icon_names)
-{
-        return g_object_new (GVC_TYPE_STREAM_STATUS_ICON,
-                             "control", control,
-                             "icon-names", icon_names,
-                             NULL);
-}