ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-sound/libindicator-icon-update into lp:indicator-sound.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)
Related bugs:
  #537977 display a mute icon until volume is changed since update
  https://bugs.launchpad.net/bugs/537977


Use the libindicator update API so that the default image gets updated
for theme changes.
-- 
https://code.launchpad.net/~ted/indicator-sound/libindicator-icon-update/+merge/21371
Your team ayatana-commits is subscribed to branch lp:indicator-sound.

=== modified file 'src/indicator-sound.c'
--- src/indicator-sound.c	2010-03-12 18:07:48 +0000
+++ src/indicator-sound.c	2010-03-15 13:50:29 +0000
@@ -400,9 +400,7 @@
 
     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 @@
     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);