From d973ef42b4bf03d7c4eecb3eb9230c98853686c4 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Tue, 11 Jan 2011 07:04:17 -0600
Subject: more fixes

---
 src/indicator-sound.c  | 19 +++++++------------
 src/slider-menu-item.c | 26 ++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index ed35d7a..adccfdd 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -149,8 +149,6 @@ indicator_sound_class_init (IndicatorSoundClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_debug(" !!!!!!!!!!!!!!!!! here 0");
-
   object_class->dispose = indicator_sound_dispose;
   object_class->finalize = indicator_sound_finalize;
 
@@ -168,8 +166,6 @@ indicator_sound_class_init (IndicatorSoundClass *klass)
 static void
 indicator_sound_init (IndicatorSound *self)
 {
-  g_debug(" !!!!!!!!!!!!!!!!! here 0");
-
   self->service = NULL;
   self->service = indicator_service_manager_new_version(INDICATOR_SOUND_DBUS_NAME,
                                                         INDICATOR_SOUND_DBUS_VERSION);
@@ -187,8 +183,6 @@ indicator_sound_init (IndicatorSound *self)
   GList* t_list = NULL;
   priv->transport_widgets_list = t_list;
   
-  g_debug(" !!!!!!!!!!!!!!!!! here 1");
-
   g_signal_connect(G_OBJECT(self->service),
                    INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE,
                    G_CALLBACK(connection_changed), self);
@@ -276,7 +270,7 @@ free_the_animation_list()
 static gboolean
 new_transport_widget(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
 {
-  //g_debug("indicator-sound: new_transport_bar() called ");
+  g_debug("indicator-sound: new_transport_bar() called ");
 
   GtkWidget* bar = NULL;
   IndicatorObject *io = NULL;
@@ -300,7 +294,7 @@ new_transport_widget(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbus
 static gboolean
 new_metadata_widget(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
 {
-  //g_debug("indicator-sound: new_metadata_widget");
+  g_debug("indicator-sound: new_metadata_widget");
 
   GtkWidget* metadata = NULL;
 
@@ -322,8 +316,7 @@ new_title_widget(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusmenu
   g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
   g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
 
-  //g_debug ("%s (\"%s\")", __func__,
-  //dbusmenu_menuitem_property_get(newitem, DBUSMENU_TITLE_MENUITEM_NAME));
+  g_debug ("%s (\"%s\")", __func__, dbusmenu_menuitem_property_get(newitem, DBUSMENU_TITLE_MENUITEM_NAME));
 
   GtkWidget* title = NULL;
 
@@ -341,7 +334,7 @@ new_title_widget(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusmenu
 static gboolean
 new_volume_slider_widget(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
 {
-  //g_debug("indicator-sound: new_volume_slider_widget");
+  g_debug("indicator-sound: new_volume_slider_widget");
 
   GtkWidget* volume_widget = NULL;
   IndicatorObject *io = NULL;
@@ -708,7 +701,9 @@ static void g_signal_cb ( GDBusProxy *proxy,
   GVariant *value = g_variant_get_child_value (parameters, 0);
   gboolean input = g_variant_get_boolean (value);
   g_variant_unref (parameters);
-    
+
+  g_debug ( "!!! signal_cb with value %i", input);
+  
   if (g_strcmp0(signal_name, INDICATOR_SOUND_SIGNAL_SINK_AVAILABLE_UPDATE) == 0){
     react_to_signal_sink_availability_update ( input, self );
   }
diff --git a/src/slider-menu-item.c b/src/slider-menu-item.c
index d0d2050..0f2f07b 100644
--- a/src/slider-menu-item.c
+++ b/src/slider-menu-item.c
@@ -39,7 +39,8 @@ static void slider_menu_item_class_init (SliderMenuItemClass *klass);
 static void slider_menu_item_init       (SliderMenuItem *self);
 static void slider_menu_item_dispose    (GObject *object);
 static void slider_menu_item_finalize   (GObject *object);
-static void handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+static void handle_event (DbusmenuMenuitem * mi, const gchar * name, 
+                          GVariant * value, guint timestamp);
 
 G_DEFINE_TYPE (SliderMenuItem, slider_menu_item, DBUSMENU_TYPE_MENUITEM);
 
@@ -77,12 +78,29 @@ slider_menu_item_finalize (GObject *object)
 
 
 static void
-handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp)
+handle_event (DbusmenuMenuitem * mi,
+              const gchar * name,
+              GVariant * value,
+              guint timestamp)
 {
   gdouble volume_input = 0;
-  volume_input = g_value_get_double(value);
-  if (value != NULL)
+  /*g_debug ( "handle-event in the slider at the backend, input is of type %s",
+             g_variant_get_type_string(value));*/
+
+  GVariant* input = NULL;
+  input = value;
+  g_variant_ref (input);
+
+  // Please note: Subject to change in future DBusmenu revisions
+  if (g_variant_is_of_type(value, G_VARIANT_TYPE_VARIANT) == TRUE) {
+    input = g_variant_get_variant(value);
+  }
+
+  volume_input = g_variant_get_double(input);
+  if (value != NULL){
     set_sink_volume(volume_input);
+  }
+  g_variant_unref (input); 
 }
 
 
-- 
cgit v1.2.3