gnome-applets r11320 - trunk/mixer

[callum svn gnome org]

Author: callum
Date: Wed Mar  4 05:44:04 2009
New Revision: 11320
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11320&view=rev

Log:
Move the dock update code to be in sync with the icon update code. Bug 573924.

Modified:
   trunk/mixer/ChangeLog
   trunk/mixer/applet.c

Modified: trunk/mixer/applet.c
==============================================================================
--- trunk/mixer/applet.c	(original)
+++ trunk/mixer/applet.c	Wed Mar  4 05:44:04 2009
@@ -686,12 +686,6 @@
 			        "/commands/Mute",
 			        "state", newmute ? "1" : "0", NULL);
 
-  /* Update the dock. */
-  if (applet->dock) {
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (applet->dock->mute), 
-				  newmute);
-  }
-
   /* update graphic - this should happen automagically after the next
    * idle call, but apparently doesn't for some people... */
   gnome_volume_applet_refresh (applet, TRUE, -1, newmute);
@@ -1133,6 +1127,11 @@
 
     gtk_image_set_from_pixbuf (applet->image, pixbuf);
     applet->state = STATE (volume, mute);
+
+    if (applet->dock) {
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (applet->dock->mute), 
+				    mute);
+    }
   }
 
   if (!did_change || !applet->mixer)