Merged with experimental (r207)

icons/scalable/wicd-client.svg

@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="720"
+   height="720"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="wicd.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3244">
+      <stop
+         style="stop-color:#969696;stop-opacity:1;"
+         offset="0"
+         id="stop3246" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3248" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2447"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3244"
+       id="radialGradient3250"
+       cx="382.01013"
+       cy="779.00507"
+       fx="382.01013"
+       fy="779.00507"
+       r="150.90694"
+       gradientTransform="matrix(1,0,0,0.7028571,0,231.4758)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3244"
+       id="radialGradient4978"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.7028571,0,231.4758)"
+       cx="382.01013"
+       cy="779.00507"
+       fx="382.01013"
+       fy="779.00507"
+       r="150.90694" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3244"
+       id="radialGradient5001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.7028571,0,231.4758)"
+       cx="382.01013"
+       cy="779.00507"
+       fx="382.01013"
+       fy="779.00507"
+       r="150.90694" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3244"
+       id="radialGradient5012"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.7028571,0,231.4758)"
+       cx="382.01013"
+       cy="779.00507"
+       fx="382.01013"
+       fy="779.00507"
+       r="150.90694" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.57982756"
+     inkscape:cx="285.61634"
+     inkscape:cy="371.31656"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1024"
+     inkscape:window-height="713"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-16,-9.9999999)">
+    <g
+       id="g5056"
+       style="opacity:1;fill:#00ff29;fill-opacity:1"
+       transform="matrix(1.1648659,0,0,0.9712156,4.240438,14.085049)">
+      <path
+         id="path2453"
+         d="M 186.59175,18.498 C 95.429114,33.24071 24.498002,144.28242 24.498,278.9355 C 24.498,419.56035 101.86548,534.42119 198.84175,540.748 C 137.82026,495.75066 95.154254,393.49877 95.154254,274.623 C 95.154254,163.86715 132.18304,67.53565 186.59175,18.498 z"
+         style="fill:#00ff29;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:16.99600029;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:#00ff29;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:16.99600029;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 452.38876,18.498 C 543.5514,33.24071 614.48251,144.28242 614.48251,278.9355 C 614.48251,419.56035 537.11503,534.42119 440.13876,540.748 C 501.16025,495.75066 543.82626,393.49877 543.82626,274.623 C 543.82626,163.86715 506.79747,67.53565 452.38876,18.498 z"
+         id="path3232" />
+      <path
+         id="path3234"
+         d="M 386.35021,146.20734 C 431.4318,153.73978 466.50854,210.47392 466.50854,279.27174 C 466.50854,351.12069 428.2489,409.80612 380.29235,413.03866 C 410.4686,390.04833 431.56772,337.80514 431.56772,277.06836 C 431.56772,220.48028 413.25631,171.26197 386.35021,146.20734 z"
+         style="fill:#00ff29;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:8.54313183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:#00ff29;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:8.54313183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 252.6303,146.20734 C 207.54871,153.73978 172.47197,210.47392 172.47197,279.27174 C 172.47197,351.12069 210.73161,409.80612 258.68816,413.03866 C 228.51191,390.04833 207.41279,337.80514 207.41279,277.06836 C 207.41279,220.48028 225.7242,171.26197 252.6303,146.20734 z"
+         id="path3236" />
+    </g>
+    <g
+       id="g5051"
+       transform="translate(56.913473,0)">
+      <path
+         transform="translate(-60.795204,-130.1329)"
+         d="M 443.23521,412.51678 A 62.949749,51.739521 0 1 1 317.33571,412.51678 A 62.949749,51.739521 0 1 1 443.23521,412.51678 z"
+         sodipodi:ry="51.739521"
+         sodipodi:rx="62.949749"
+         sodipodi:cy="412.51678"
+         sodipodi:cx="380.28546"
+         id="path3238"
+         style="stroke:none;stroke-width:16.99600029;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <rect
+         y="285.83316"
+         x="279.82327"
+         height="408.74219"
+         width="79.333931"
+         id="rect3240"
+         style="fill:#000000;fill-opacity:1;stroke-width:16.99600029;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         y="647.3656"
+         x="178.06889"
+         height="81.058578"
+         width="282.84271"
+         id="rect5017"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:16.99600029;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

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	

in/other=55wicd.in

@@ -6,24 +6,26 @@
 
 wicd_suspend()
 {
-    # Put wifi interface down
+	# Put wifi interface down
-    %LIB%suspend.py
+	%LIB%suspend.py 2>/dev/null
+	return $NA
 }
 
 wicd_resume()
 {
-    # Bring wifi interface back up
+	# Bring wifi interface back up
-    %LIB%autoconnect.py
+	%LIB%autoconnect.py 2>/dev/null
+	return $NA
 }
 
 case "$1" in
-    hibernate|suspend)
+	hibernate|suspend)
-        wicd_suspend
+		wicd_suspend
-        ;;
+		;;
-    thaw|resume)
+	thaw|resume)
-        wicd_resume
+		wicd_resume
-        ;;
+		;;
-    *) exit $NA
+	*) exit $NA
-        ;;
+		;;
 esac
 

other/wicd.conf

@@ -25,13 +25,5 @@
         </policy>
         <policy context="default">
                 <deny own="org.wicd.daemon"/>
-                <deny send_destination="org.wicd.daemon"/>
-                <deny send_interface="org.wicd.daemon"/>
-		<deny send_destination="org.wicd.daemon.wireless"/>
-		<deny send_interface="org.wicd.daemon.wireless"/>
-		<deny send_destination="org.wicd.daemon.wired"/>
-		<deny send_interface="org.wicd.daemon.wired"/>
-		<deny send_destination="org.wicd.daemon.config"/>
-		<deny send_interface="org.wicd.daemon.config"/>
         </policy>
 </busconfig>

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

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):