aboutsummaryrefslogtreecommitdiff
path: root/src/dbus-menu-manager.c
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-01-14 10:53:50 -0600
committerKen VanDine <ken.vandine@canonical.com>2011-01-14 10:53:50 -0600
commit500000a82b6785e2bf7732ee87f36c6a44d2767c (patch)
treefdac470fe96ff3f2f2ee1e70fcf093a8403915db /src/dbus-menu-manager.c
parent412bffad64182bfae1e2408b89f9488f0da38481 (diff)
parent991d41fa7c9b5b51942f836ca68265513de6ef8c (diff)
downloadayatana-indicator-sound-500000a82b6785e2bf7732ee87f36c6a44d2767c.tar.gz
ayatana-indicator-sound-500000a82b6785e2bf7732ee87f36c6a44d2767c.tar.bz2
ayatana-indicator-sound-500000a82b6785e2bf7732ee87f36c6a44d2767c.zip
Import upstream version 0.5.6
Diffstat (limited to 'src/dbus-menu-manager.c')
-rw-r--r--src/dbus-menu-manager.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/dbus-menu-manager.c b/src/dbus-menu-manager.c
index f92c324..92bfba5 100644
--- a/src/dbus-menu-manager.c
+++ b/src/dbus-menu-manager.c
@@ -21,9 +21,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <unistd.h>
#include <glib/gi18n.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-
#include <libdbusmenu-glib/server.h>
#include <libdbusmenu-glib/client.h>
@@ -71,7 +68,7 @@ DbusmenuMenuitem* dbus_menu_manager_setup()
dbus_interface = g_object_new(SOUND_SERVICE_DBUS_TYPE, NULL);
- DbusmenuServer *server = dbusmenu_server_new(INDICATOR_SOUND_DBUS_OBJECT);
+ DbusmenuServer *server = dbusmenu_server_new(INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH);
dbusmenu_server_set_root(server, root_menuitem);
establish_pulse_activities(dbus_interface);
return root_menuitem;
@@ -79,10 +76,10 @@ DbusmenuMenuitem* dbus_menu_manager_setup()
void dbus_menu_manager_update_volume(gdouble volume)
{
- GValue value = {0};
- g_value_init(&value, G_TYPE_DOUBLE);
- g_value_set_double(&value, volume);
- dbusmenu_menuitem_property_set_value(DBUSMENU_MENUITEM(volume_slider_menuitem), DBUSMENU_VOLUME_MENUITEM_LEVEL, &value);
+ GVariant* new_volume = g_variant_new_double(volume);
+ dbusmenu_menuitem_property_set_variant(DBUSMENU_MENUITEM(volume_slider_menuitem),
+ DBUSMENU_VOLUME_MENUITEM_LEVEL,
+ new_volume);
}