releasing version 0.1.3.1-0ubuntu2

4 files changed, 14 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index e666071..ddd38fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+indicator-sound (0.1.3.1-0ubuntu2) lucid; urgency=low
+
+  * Backport upstream changes to fix those issues:
+    - "Wrong i18n for menu entries", thank Luca Ferretti (lp: #538704)
+    - "display a mute icon until volume is changed since update" (lp: #537977)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 15 Mar 2010 15:51:35 +0100
+
 indicator-sound (0.1.3.1-0ubuntu1) lucid; urgency=low
 
   * New upstream version:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6cb8472..423ff8e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
 [encoding: UTF-8]
 data/indicator-sound.schemas.in
-src/indicator-sound.c
-src/sound-service.c
+src/dbus-menu-manager.c
diff --git a/src/dbus-menu-manager.c b/src/dbus-menu-manager.c
index 38ed727..1628a59 100644
--- a/src/dbus-menu-manager.c
+++ b/src/dbus-menu-manager.c
@@ -117,7 +117,7 @@ void dbus_menu_manager_update_mute_ui(gboolean incoming_mute_value)
     b_all_muted = incoming_mute_value;
     dbusmenu_menuitem_property_set(mute_all_menuitem,
                                     DBUSMENU_MENUITEM_PROP_LABEL, 
-                                    _(b_all_muted == FALSE ? "Mute All" : "Unmute"));
+                                    b_all_muted == FALSE ? _("Mute All") : _("Unmute"));
 }
 
 
@@ -191,7 +191,7 @@ static void rebuild_sound_menu(DbusmenuMenuitem *root, SoundServiceDbus *service
 {
     // Mute button
     mute_all_menuitem = dbusmenu_menuitem_new();
-    dbusmenu_menuitem_property_set(mute_all_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _(b_all_muted == FALSE ? "Mute All" : "Unmute"));
+    dbusmenu_menuitem_property_set(mute_all_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, b_all_muted == FALSE ? _("Mute All") : _("Unmute"));
     g_signal_connect(G_OBJECT(mute_all_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(set_global_mute_from_ui), NULL);
     dbusmenu_menuitem_property_set_bool(mute_all_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, b_sink_available);
 
@@ -230,7 +230,7 @@ static void set_global_mute_from_ui()
     toggle_global_mute(b_all_muted); 
     dbusmenu_menuitem_property_set(mute_all_menuitem,
                                    DBUSMENU_MENUITEM_PROP_LABEL,
-                                   _(b_all_muted == FALSE ? "Mute All" : "Unmute"));
+                                   b_all_muted == FALSE ? _("Mute All") : _("Unmute"));
 }
 
 
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index aa87410..3b2b426 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -400,9 +400,7 @@ static void update_state(const gint state)
 
     current_state = state;
     gchar* image_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(current_state));
-	GtkImage * tempimage = indicator_image_helper(image_name);
-    gtk_image_set_from_pixbuf(speaker_image, gtk_image_get_pixbuf(tempimage));
-	g_object_ref_sink(tempimage);
+    indicator_image_helper_update(speaker_image, image_name);
 }
 
 
@@ -493,9 +491,7 @@ static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean blo
     g_debug("signal caught - sink input while muted with value %i", block_value);
     if (block_value == 1 && animation_id == 0 && blocked_animation_list != NULL) {
         gchar* image_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_MUTED_WHILE_INPUT));
-    	GtkImage * tempimage = indicator_image_helper(image_name);
-        gtk_image_set_from_pixbuf(speaker_image, gtk_image_get_pixbuf(tempimage));
-        g_object_ref_sink(tempimage);
+        indicator_image_helper_update(speaker_image, image_name);
 
         blocked_iter = blocked_animation_list;
         animation_id = g_timeout_add_seconds(1, fade_back_to_mute_image, NULL);