From 5d32cec559249cb0e3b0a85ecdc8e0a5dc1ab199 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Wed, 16 Feb 2011 11:20:21 +0000
Subject: reverted luke's work until indicator object is updated

---
 src/volume-widget.c | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'src/volume-widget.c')

diff --git a/src/volume-widget.c b/src/volume-widget.c
index 247dfe6..ceebec5 100644
--- a/src/volume-widget.c
+++ b/src/volume-widget.c
@@ -37,7 +37,6 @@ struct _VolumeWidgetPrivate
   DbusmenuMenuitem* twin_item;  
   GtkWidget* ido_volume_slider;
   gboolean grabbed;
-  IndicatorObject* indicator;
 };
 
 #define VOLUME_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), VOLUME_WIDGET_TYPE, VolumeWidgetPrivate))
@@ -138,11 +137,6 @@ volume_widget_property_update( DbusmenuMenuitem* item, gchar* property,
       gdouble update = g_variant_get_double (value);
       //g_debug("volume-widget - update level with value %f", update);
       gtk_range_set_value(range, update);
-      g_signal_emit(G_OBJECT(priv->indicator),
-                    INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID,
-                    0,
-                    (IndicatorObjectEntry *)indicator_object_get_entries(INDICATOR_OBJECT(priv->indicator))->data,
-                    TRUE);
     }
   }
 }
@@ -162,11 +156,6 @@ volume_widget_set_twin_item(VolumeWidget* self,
   GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider);
   GtkRange *range = (GtkRange*)slider;
   gtk_range_set_value(range, initial_level);
-  g_signal_emit(G_OBJECT(priv->indicator),
-                INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID,
-                0,
-                (IndicatorObjectEntry *)indicator_object_get_entries(INDICATOR_OBJECT(priv->indicator))->data,
-                TRUE);
 }
 
 static gboolean
@@ -207,11 +196,6 @@ volume_widget_update(VolumeWidget* self, gdouble update)
   gdouble clamped = CLAMP(update, 0, 100);
   GVariant* new_volume = g_variant_new_double(clamped);
   dbusmenu_menuitem_handle_event (priv->twin_item, "update", new_volume, 0);
-  g_signal_emit(G_OBJECT(priv->indicator),
-                INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID,
-                0,
-                (IndicatorObjectEntry *)indicator_object_get_entries(INDICATOR_OBJECT(priv->indicator))->data,
-                TRUE);
 }
 
 GtkWidget*
@@ -267,12 +251,10 @@ volume_widget_get_current_volume ( GtkWidget *widget )
  * volume_widget_new:
  * @returns: a new #VolumeWidget.
  **/
-GtkWidget*
-volume_widget_new(DbusmenuMenuitem *item, IndicatorObject* io)
+GtkWidget* 
+volume_widget_new(DbusmenuMenuitem *item)
 {
   GtkWidget* widget = g_object_new(VOLUME_WIDGET_TYPE, NULL);
-  VolumeWidgetPrivate* priv = VOLUME_WIDGET_GET_PRIVATE(VOLUME_WIDGET(widget));
-  priv->indicator = io;
   volume_widget_set_twin_item((VolumeWidget*)widget, item);
   return widget;
 }
-- 
cgit v1.2.3