Merge lp:~cjcurran/indicator-sound/fix-lp-902715 into lp:indicator-sound/12.10

[Conor Curran]

Luke said to go ahead and release with the fix in this branch. We can delve deeper when there is a chance later next month.

[Charles Kerr (charlesk)]

This patch is still incomplete, but you're aware of that and this patch does improve the problem in Bug #902715.

review: Approve

=== modified file 'src/volume-widget.c'
--- src/volume-widget.c	2012-03-17 00:37:32 +0000
+++ src/volume-widget.c	2012-04-25 01:04:26 +0000
@@ -135,16 +135,28 @@
 
   if(g_ascii_strcasecmp(DBUSMENU_VOLUME_MENUITEM_LEVEL, property) == 0){
     g_return_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE_DOUBLE) );
+    gdouble update = g_variant_get_double (value);
+
     if(priv->grabbed == FALSE){
       GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider);
       GtkRange *range = (GtkRange*)slider;
-      gdouble update = g_variant_get_double (value);
       gtk_range_set_value(range, update);
 /*
       g_debug ("volume-widget::volume_widget_property_update - volume - value %f", update);
-*/
-      update_accessible_desc(priv->indicator);
+      AtkObject* atk_object;
+      atk_object = gtk_widget_get_accessible (priv->ido_volume_slider);
+      if (atk_object != NULL){
+        atk_object_set_name (atk_object, desc);
+      
+      }*/
     }
+    gchar* desc = g_strdup_printf(_("Volume (%'.0f%%)"),
+                                    update);      
+    dbusmenu_menuitem_property_set (priv->twin_item,
+                                    DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC,
+                                    desc);
+    g_free (desc);
+    update_accessible_desc(priv->indicator);    
   }
   else if(g_ascii_strcasecmp(DBUSMENU_VOLUME_MENUITEM_MUTE, property) == 0){
     g_return_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN));
@@ -196,6 +208,13 @@
     initial_level = 0;
   }
   gtk_range_set_value(range, initial_level);
+  gchar* desc = g_strdup_printf(_("Volume (%'.0f%%)"),
+                                  initial_level);      
+  dbusmenu_menuitem_property_set (priv->twin_item,
+                                  DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC,
+                                  desc);
+  g_free (desc);
+
 }
 
 static gboolean