From 9452f0262c608fc1ee6509078b3538f68b5f0993 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 10 Jan 2011 16:47:20 -0600
Subject: now building

---
 src/dbus-menu-manager.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/dbus-menu-manager.c')

diff --git a/src/dbus-menu-manager.c b/src/dbus-menu-manager.c
index f92c324..e51db0d 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>
 
@@ -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);  
 }
                                      
 
-- 
cgit v1.2.3


From cf13be5b4436b802488e1980bb89aa87997cd90e Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Tue, 11 Jan 2011 10:30:56 -0600
Subject: refactored signal names

---
 src/dbus-menu-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/dbus-menu-manager.c')

diff --git a/src/dbus-menu-manager.c b/src/dbus-menu-manager.c
index e51db0d..92bfba5 100644
--- a/src/dbus-menu-manager.c
+++ b/src/dbus-menu-manager.c
@@ -68,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;
-- 
cgit v1.2.3