Merged with r235 of experimental-rworkman.

in/init=slackware=rc.wicd.in

@@ -49,4 +49,3 @@ case $1 in
    ;;
 esac
 
-

setup.py

@@ -189,13 +189,22 @@ class configure(Command):
             else:
                self.kdedir = kdedir_candidate + '/share/autostart'
         except (OSError, ValueError):
-            # If kde-config isn't present or returns an error, then we can
-            # assume that kde isn't installed on the user's system
-            self.no_install_kde = True
-            # If it turns out that the assumption above is wrong, then we'll
-            # do this instead:
-            #pass # use our default
-
+            # If kde-config isn't present, we'll check for kde-4.x
+            try:
+                kde4temp = subprocess.Popen(["kde4-config","--prefix"], stdout=subprocess.PIPE)
+                returncode = kde4temp.wait() # let it finish, and get the exit code
+                kde4dir_candidate = kde4temp.stdout.readline().strip() # read stdout
+                if len(kde4dir_candidate) == 0 or returncode != 0 or not os.path.isabs(kde4dir_candidate):
+                    raise ValueError
+                else:
+                   self.kdedir = kde4dir_candidate + '/share/autostart'
+            except (OSError, ValueError):
+                # If neither kde-config nor kde4-config are not present or 
+                # return an error, then we can assume that kde isn't installed
+                # on the user's system
+                self.no_install_kde = True
+                # If the assumption above turns out to be wrong, do this:
+                #pass # use our default
 
         self.python = '/usr/bin/python'
         self.pidfile = '/var/run/wicd/wicd.pid'