From efb70bd97243d1036fd7e83cfcc8aa02d2aa295d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 26 Aug 2004 01:37:03 +0000 Subject: [PATCH] 2004-08-25 Dan Williams * panel-applet/NMWirelessApplet.c - (nmwa_udpate_state): Set panel icon to "wired" (for lack of better ones) when NM isn't around or when its not connected * src/NetworkManagerDevice.c - (nm_device_activation_worker): Make sure to reset dev->activating if we get canceled. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@73 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 10 ++++++++++ panel-applet/NMWirelessApplet.c | 3 +++ src/NetworkManagerDevice.c | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index 275adf1db..d2ae649f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-08-25 Dan Williams + + * panel-applet/NMWirelessApplet.c + - (nmwa_udpate_state): Set panel icon to "wired" (for lack of better ones) + when NM isn't around or when its not connected + + * src/NetworkManagerDevice.c + - (nm_device_activation_worker): Make sure to reset dev->activating if we get + canceled. + 2004-08-25 Dan Williams * panel-applet/NMWirelessAppletDbus.c diff --git a/panel-applet/NMWirelessApplet.c b/panel-applet/NMWirelessApplet.c index 651f83812..891626b2c 100644 --- a/panel-applet/NMWirelessApplet.c +++ b/panel-applet/NMWirelessApplet.c @@ -130,9 +130,12 @@ fprintf( stderr, "state (%d)\n", applet->applet_state); switch (applet->applet_state) { case (APPLET_STATE_NO_NM): + applet->pix_state = PIX_WIRED; /* FIXME: get a "no NetworkManager" picture */ break; case (APPLET_STATE_NO_CONNECTION): + applet->pix_state = PIX_WIRED; /* FIXME: get a "no connection" picture */ + break; case (APPLET_STATE_WIRED): case (APPLET_STATE_WIRED_CONNECTING): diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c index 4fb57d86f..056d661f5 100644 --- a/src/NetworkManagerDevice.c +++ b/src/NetworkManagerDevice.c @@ -979,6 +979,7 @@ static gpointer nm_device_activation_worker (gpointer user_data) if (dev->quit_activation) { syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 1", nm_device_get_iface (dev)); + dev->activating = FALSE; dev->just_activated = FALSE; nm_device_unref (dev); return (NULL); @@ -994,6 +995,7 @@ static gpointer nm_device_activation_worker (gpointer user_data) if (dev->quit_activation) { syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 1.5", nm_device_get_iface (dev)); + dev->activating = FALSE; dev->just_activated = FALSE; nm_device_unref (dev); return (NULL); @@ -1048,6 +1050,7 @@ static gpointer nm_device_activation_worker (gpointer user_data) if (dev->quit_activation) { syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 2", nm_device_get_iface (dev)); + dev->activating = FALSE; dev->just_activated = FALSE; nm_device_unref (dev); return (NULL); @@ -1061,6 +1064,7 @@ static gpointer nm_device_activation_worker (gpointer user_data) if (dev->quit_activation) { syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 3", nm_device_get_iface (dev)); + dev->activating = FALSE; dev->just_activated = FALSE; nm_device_unref (dev); return (NULL);