aboutsummaryrefslogtreecommitdiff
path: root/src/dbus-menu-manager.c
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-09-14 19:18:28 +0100
committerConor Curran <conor.curran@canonical.com>2010-09-14 19:18:28 +0100
commita817479e8353f8f84dc4f95bb980f2d1b4ba1380 (patch)
treeff8c1c03db6d2dbc98417a16dcca51916610e4a7 /src/dbus-menu-manager.c
parent0568dd3b8c0510269699d4f9f256b878137008d3 (diff)
parentbab2f6616d4ad90243d3551513ad9e90c0df692e (diff)
downloadayatana-indicator-sound-a817479e8353f8f84dc4f95bb980f2d1b4ba1380.tar.gz
ayatana-indicator-sound-a817479e8353f8f84dc4f95bb980f2d1b4ba1380.tar.bz2
ayatana-indicator-sound-a817479e8353f8f84dc4f95bb980f2d1b4ba1380.zip
service crash fix branch merge
Diffstat (limited to 'src/dbus-menu-manager.c')
-rw-r--r--src/dbus-menu-manager.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/dbus-menu-manager.c b/src/dbus-menu-manager.c
index 5ea561f..63e91b4 100644
--- a/src/dbus-menu-manager.c
+++ b/src/dbus-menu-manager.c
@@ -50,9 +50,11 @@ static gdouble volume_percent = 0.0;
static void set_global_mute_from_ui();
static gboolean idle_routine (gpointer data);
-static void rebuild_sound_menu(DbusmenuMenuitem *root, SoundServiceDbus *service);
+static void rebuild_sound_menu(DbusmenuMenuitem *root,
+ SoundServiceDbus *service);
static void refresh_menu();
+
/*-------------------------------------------------------------------------*/
// Public Methods
/*-------------------------------------------------------------------------*/
@@ -75,7 +77,6 @@ DbusmenuMenuitem* dbus_menu_manager_setup()
return root_menuitem;
}
-
void dbus_menu_manager_update_volume(gdouble volume)
{
GValue value = {0};
@@ -213,7 +214,7 @@ static void rebuild_sound_menu(DbusmenuMenuitem *root, SoundServiceDbus *service
// Sound preferences dialog
DbusmenuMenuitem *settings_mi = dbusmenu_menuitem_new();
dbusmenu_menuitem_property_set(settings_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Sound Preferences..."));
-//_("Sound Preferences..."));
+ //_("Sound Preferences..."));
dbusmenu_menuitem_child_append(root, settings_mi);
g_signal_connect(G_OBJECT(settings_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
G_CALLBACK(show_sound_settings_dialog), NULL);