diff --git a/icons/128px/wicd-client.png b/icons/128px/wicd-client.png index e69de29..a546623 100644 Binary files a/icons/128px/wicd-client.png and b/icons/128px/wicd-client.png differ diff --git a/icons/16px/wicd-client.png b/icons/16px/wicd-client.png index e69de29..5d946ff 100644 Binary files a/icons/16px/wicd-client.png and b/icons/16px/wicd-client.png differ diff --git a/icons/192px/wicd-client.png b/icons/192px/wicd-client.png index e69de29..607dd8c 100644 Binary files a/icons/192px/wicd-client.png and b/icons/192px/wicd-client.png differ diff --git a/icons/22px/wicd-client.png b/icons/22px/wicd-client.png index e69de29..a906f4c 100644 Binary files a/icons/22px/wicd-client.png and b/icons/22px/wicd-client.png differ diff --git a/icons/24px/wicd-client.png b/icons/24px/wicd-client.png index e69de29..42f8a7b 100644 Binary files a/icons/24px/wicd-client.png and b/icons/24px/wicd-client.png differ diff --git a/icons/32px/wicd-client.png b/icons/32px/wicd-client.png index e69de29..fb05a6d 100644 Binary files a/icons/32px/wicd-client.png and b/icons/32px/wicd-client.png differ diff --git a/icons/36px/wicd-client.png b/icons/36px/wicd-client.png index e69de29..dd6ba06 100644 Binary files a/icons/36px/wicd-client.png and b/icons/36px/wicd-client.png differ diff --git a/icons/48px/wicd-client.png b/icons/48px/wicd-client.png index e69de29..ef0f767 100644 Binary files a/icons/48px/wicd-client.png and b/icons/48px/wicd-client.png differ diff --git a/icons/64px/wicd-client.png b/icons/64px/wicd-client.png index e69de29..f569077 100644 Binary files a/icons/64px/wicd-client.png and b/icons/64px/wicd-client.png differ diff --git a/icons/72px/wicd-client.png b/icons/72px/wicd-client.png index e69de29..d3c45e9 100644 Binary files a/icons/72px/wicd-client.png and b/icons/72px/wicd-client.png differ diff --git a/icons/96px/wicd-client.png b/icons/96px/wicd-client.png index e69de29..6bdd5cc 100644 Binary files a/icons/96px/wicd-client.png and b/icons/96px/wicd-client.png differ diff --git a/icons/scalable/wicd-client.svg b/icons/scalable/wicd-client.svg index e69de29..2f46f58 100644 --- a/icons/scalable/wicd-client.svg +++ b/icons/scalable/wicd-client.svg @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/in/init=slackware=rc.wicd.in b/in/init=slackware=rc.wicd.in index b2f29f3..6373c6a 100755 --- a/in/init=slackware=rc.wicd.in +++ b/in/init=slackware=rc.wicd.in @@ -17,10 +17,6 @@ wicd_start() { else echo "Starting wicd daemon..." wicd 2>/dev/null 1>&2 - # Activate the pm-utils sleep hook - if [ ! -x %PMUTILS%55wicd ]; then - chmod +x %PMUTILS%55wicd - fi fi } @@ -32,11 +28,6 @@ wicd_stop() { else pkill -f python.*wicd-daemon.py 2>/dev/null fi - # Deactivate the pm-utils sleep hook - if [ -x %PMUTILS%55wicd ]; then - chmod -x %PMUTILS%55wicd - fi - } # See how we were called and take appropriate action diff --git a/in/other=55wicd.in b/in/other=55wicd.in index f35500d..94ca3f1 100755 --- a/in/other=55wicd.in +++ b/in/other=55wicd.in @@ -6,24 +6,26 @@ wicd_suspend() { - # Put wifi interface down - %LIB%suspend.py + # Put wifi interface down + %LIB%suspend.py 2>/dev/null + return $NA } wicd_resume() { - # Bring wifi interface back up - %LIB%autoconnect.py + # Bring wifi interface back up + %LIB%autoconnect.py 2>/dev/null + return $NA } case "$1" in - hibernate|suspend) - wicd_suspend - ;; - thaw|resume) - wicd_resume - ;; - *) exit $NA - ;; + hibernate|suspend) + wicd_suspend + ;; + thaw|resume) + wicd_resume + ;; + *) exit $NA + ;; esac diff --git a/other/wicd.conf b/other/wicd.conf index 05ab9ab..4004de1 100755 --- a/other/wicd.conf +++ b/other/wicd.conf @@ -25,13 +25,5 @@ - - - - - - - - diff --git a/wicd/autoconnect.py b/wicd/autoconnect.py old mode 100644 new mode 100755 diff --git a/wicd/monitor.py b/wicd/monitor.py index 9f5be50..b875b10 100755 --- a/wicd/monitor.py +++ b/wicd/monitor.py @@ -27,6 +27,8 @@ when appropriate. import gobject import time +from dbus import DBusException + from wicd import wpath from wicd import misc from wicd import dbusmanager @@ -167,7 +169,7 @@ class ConnectionStatus(object): from_wireless = False self.auto_reconnect(from_wireless) self.update_state(state) - except dbus.exceptions.DBusException, e: + except DBusException, e: print 'Ignoring DBus Error: ' + str(e) return True @@ -229,7 +231,7 @@ class ConnectionStatus(object): # Some checks to keep reconnect retries from going crazy. if self.reconnect_tries > 2 and \ - time.time() - self.last_reconnect_time < 300: + (time.time() - self.last_reconnect_time) < 300: return self.reconnecting = True diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py index 638247f..d40ee8a 100644 --- a/wicd/wicd-daemon.py +++ b/wicd/wicd-daemon.py @@ -294,7 +294,7 @@ class WicdDaemon(dbus.service.Object): if self.suspended: self.Disconnect() else: - self.forced_disconnect = False + self.SetForcedDisconnect(False) @dbus.service.method('org.wicd.daemon') def GetSuspend(self):