colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2004-08-25 Dan Williams <dcbw@redhat.com>

Browse Source 
* 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
This commit is contained in:
Dan Williams
2004-08-26 01:37:03 +00:00
parent bbc8ab5e1a
commit efb70bd972
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2004-08-25 Dan Williams <dcbw@redhat.com>
* 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 <dcbw@redhat.com> 2004-08-25 Dan Williams <dcbw@redhat.com>
* panel-applet/NMWirelessAppletDbus.c * panel-applet/NMWirelessAppletDbus.c

3
panel-applet/NMWirelessApplet.c
View File

@@ -130,9 +130,12 @@ fprintf( stderr, "state (%d)\n", applet->applet_state);
switch (applet->applet_state) switch (applet->applet_state)
{ {
case (APPLET_STATE_NO_NM): case (APPLET_STATE_NO_NM):
applet->pix_state = PIX_WIRED; /* FIXME: get a "no NetworkManager" picture */
break; break;
case (APPLET_STATE_NO_CONNECTION): 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):
case (APPLET_STATE_WIRED_CONNECTING): case (APPLET_STATE_WIRED_CONNECTING):

4
src/NetworkManagerDevice.c
View File

@@ -979,6 +979,7 @@ static gpointer nm_device_activation_worker (gpointer user_data)
if (dev->quit_activation) if (dev->quit_activation)
{ {
syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 1", nm_device_get_iface (dev)); syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 1", nm_device_get_iface (dev));
dev->activating = FALSE;
dev->just_activated = FALSE; dev->just_activated = FALSE;
nm_device_unref (dev); nm_device_unref (dev);
return (NULL); return (NULL);
@@ -994,6 +995,7 @@ static gpointer nm_device_activation_worker (gpointer user_data)
if (dev->quit_activation) if (dev->quit_activation)
{ {
syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 1.5", nm_device_get_iface (dev)); syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 1.5", nm_device_get_iface (dev));
dev->activating = FALSE;
dev->just_activated = FALSE; dev->just_activated = FALSE;
nm_device_unref (dev); nm_device_unref (dev);
return (NULL); return (NULL);
@@ -1048,6 +1050,7 @@ static gpointer nm_device_activation_worker (gpointer user_data)
if (dev->quit_activation) if (dev->quit_activation)
{ {
syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 2", nm_device_get_iface (dev)); syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 2", nm_device_get_iface (dev));
dev->activating = FALSE;
dev->just_activated = FALSE; dev->just_activated = FALSE;
nm_device_unref (dev); nm_device_unref (dev);
return (NULL); return (NULL);
@@ -1061,6 +1064,7 @@ static gpointer nm_device_activation_worker (gpointer user_data)
if (dev->quit_activation) if (dev->quit_activation)
{ {
syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 3", nm_device_get_iface (dev)); syslog (LOG_DEBUG, "nm_device_activation_worker(%s): activation canceled 3", nm_device_get_iface (dev));
dev->activating = FALSE;
dev->just_activated = FALSE; dev->just_activated = FALSE;
nm_device_unref (dev); nm_device_unref (dev);
return (NULL); return (NULL);