From c60713cdd63772500e1f8fd80ae19e69739a2265 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackware.com>
Date: Sun, 4 Jan 2009 02:31:01 -0600
Subject: [PATCH 1/2] s/Tenative/Tentative/g in wicd-curses(8)

---
 in/man=wicd-curses.8.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/in/man=wicd-curses.8.in b/in/man=wicd-curses.8.in
index a2fa070..ee285ed 100644
--- a/in/man=wicd-curses.8.in
+++ b/in/man=wicd-curses.8.in
@@ -49,10 +49,10 @@ These are not used yet.
 Reminder that your network configuration files are not here ;-)
 .TP 
 .I %LIB%keymap.py
-Tenative location of the system keymap
+Tentative location of the system keymap
 .TP
 .I %LIB%colors.py
-Tenative location of the system color schemes
+Tentative location of the system color schemes
 .TP
 .I ~/.wicd/keymap.py
 Custom keybindings.  Also where you can (later) disable the mouse.

From bb8cfb2b9db7c50668edc175a004dfd3034cb2b8 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackware.com>
Date: Mon, 5 Jan 2009 23:12:49 -0600
Subject: [PATCH 2/2] Added logic for kde4-config (kde4's equivalent to
 kde-config)

---
 setup.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 293f2bf..92815a4 100755
--- a/setup.py
+++ b/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'