diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-01-11 12:12:30 -0600 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-01-11 12:12:30 -0600 |
| commit | d8da7cdced255ac430caa78b9e6d24d9476e76d8 (patch) | |
| tree | 376066b4c491b77c72f3073918eec7cca8be8e65 /src/dbus-menu-manager.c | |
| parent | 714c7c49776e8a341254a3e4297b465d181206cd (diff) | |
| parent | 259057b02fe5c6b777a438331defa2dda628dfd2 (diff) | |
| download | ayatana-indicator-sound-d8da7cdced255ac430caa78b9e6d24d9476e76d8.tar.gz ayatana-indicator-sound-d8da7cdced255ac430caa78b9e6d24d9476e76d8.tar.bz2 ayatana-indicator-sound-d8da7cdced255ac430caa78b9e6d24d9476e76d8.zip | |
merged the dreaded gdbus port
Diffstat (limited to 'src/dbus-menu-manager.c')
| -rw-r--r-- | src/dbus-menu-manager.c | 13 |
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); } |