The Sound Menu

Merge lp:~ted/indicator-sound/libindicator-icon-update into lp:indicator-sound/0.1

  1. libindicator-icon-update
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/indicator-sound/libindicator-icon-update
Merge into: lp:indicator-sound/0.1
Diff against target: 25 lines (+2/-6)
1 file modified
src/indicator-sound.c (+2/-6)
To merge this branch: bzr merge lp:~ted/indicator-sound/libindicator-icon-update
Reviewer Review Type Date Requested Status
David Barth Approve
Review via email: mp+21371@code.launchpad.net

Description of the change

Use the libindicator update API so that the default image gets updated
for theme changes.

To post a comment you must log in.
Revision history for this message
David Barth (dbarth) wrote :

Easier, faster: better

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/indicator-sound.c'
2--- src/indicator-sound.c 2010-03-12 18:07:48 +0000
3+++ src/indicator-sound.c 2010-03-15 13:51:25 +0000
4@@ -400,9 +400,7 @@
5
6 current_state = state;
7 gchar* image_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(current_state));
8- GtkImage * tempimage = indicator_image_helper(image_name);
9- gtk_image_set_from_pixbuf(speaker_image, gtk_image_get_pixbuf(tempimage));
10- g_object_ref_sink(tempimage);
11+ indicator_image_helper_update(speaker_image, image_name);
12 }
13
14
15@@ -493,9 +491,7 @@
16 g_debug("signal caught - sink input while muted with value %i", block_value);
17 if (block_value == 1 && animation_id == 0 && blocked_animation_list != NULL) {
18 gchar* image_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_MUTED_WHILE_INPUT));
19- GtkImage * tempimage = indicator_image_helper(image_name);
20- gtk_image_set_from_pixbuf(speaker_image, gtk_image_get_pixbuf(tempimage));
21- g_object_ref_sink(tempimage);
22+ indicator_image_helper_update(speaker_image, image_name);
23
24 blocked_iter = blocked_animation_list;
25 animation_id = g_timeout_add_seconds(1, fade_back_to_mute_image, NULL);

Subscribers

People subscribed via source and target branches