2006-03-02 Robert Love <rml@novell.com>

* gnome/applet/applet.c: Do not set the pixbuf if we don't have an
	  active device.  But do not do what we used to do and override the
	  state, which caused the dreaded icon race of '05.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1538 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-03-02 20:51:13 +00:00 committed by Robert Love
parent b8f2200c7f
commit a0281d0e8c
2 changed files with 7 additions and 5 deletions

View file

@ -1,3 +1,9 @@
2006-03-02 Robert Love <rml@novell.com>
* gnome/applet/applet.c: Do not set the pixbuf if we don't have an
active device. But do not do what we used to do and override the
state, which caused the dreaded icon race of '05.
2006-03-02 Robert Love <rml@novell.com>
Commit Dan's update of my previous commit:

View file

@ -1063,11 +1063,6 @@ static void nma_update_state (NMApplet *applet)
goto done;
}
#if 0
if (!act_dev)
nma_set_state (applet, NM_STATE_DISCONNECTED);
#endif
switch (applet->nm_state)
{
case NM_STATE_ASLEEP:
@ -1095,6 +1090,7 @@ static void nma_update_state (NMApplet *applet)
break;
case NM_STATE_CONNECTING:
if (act_dev)
{
pixbuf = nma_act_stage_to_pixbuf (applet, act_dev, active_network, &tip);
need_animation = TRUE;