From 0eba0513601edc23db21073d0b7cf65f45efa72f Mon Sep 17 00:00:00 2001
From: imdano <>
Date: Sat, 27 Sep 2008 21:36:04 +0000
Subject: [PATCH] branches/experimental: - Fix scripts dialog not appearing.

---
 wicd/misc.py     |  1 +
 wicd/netentry.py | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/wicd/misc.py b/wicd/misc.py
index 3737008..ad109d4 100644
--- a/wicd/misc.py
+++ b/wicd/misc.py
@@ -453,6 +453,7 @@ def get_language_list_gui():
     language["backend"] = _("Backend")
     language["backend_alert"] = _("Changes to your backend won't occur until the daemon is restarted.")
     language['search_domain'] = _("Search Domain")
+    language['scripts_need_pass'] = _('You must enter your password to configure scripts')
     
     language['0'] = _('0')
     language['1'] = _('1')
diff --git a/wicd/netentry.py b/wicd/netentry.py
index b986859..75cca3f 100644
--- a/wicd/netentry.py
+++ b/wicd/netentry.py
@@ -636,19 +636,20 @@ class WiredNetworkEntry(NetworkEntry):
         if os.getuid() != 0:
             try:
                 sudo_prog = misc.choose_sudo_prog()
-                msg = "You must enter your password to configure scripts"
+                msg = msg = "'%s'" % language["scripts_need_pass"]
                 if sudo_prog.endswith("gksu") or sudo_prog.endswith("ktsuss"):
                     msg_flag = "-m"
                 else:
                     msg_flag = "--caption"
-                misc.LaunchAndWait([sudo_prog, msg_flag, msg, 
-                                    wpath.lib + "configscript.py", profile,
-                                    "wired"])
+                misc.LaunchAndWait(' '.join([sudo_prog, msg_flag, msg, 
+                                    os.path.join(wpath.lib, "configscript.py"), 
+                                    profile, "wired"]))
             except misc.WicdError:
                 error(None, "Could not find a graphical sudo program." + \
                       "  Script editor could not be launched.")
         else:
-            misc.LaunchAndWait([wpath.lib + "configscript.py", profile, "wired"])
+            misc.LaunchAndWait(' '.join([os.path.join(wpath.lib, "configscript.py"), 
+                                        profile, "wired"]))
 
     def check_enable(self):
         """ Disable objects if the profile list is empty. """
@@ -923,20 +924,20 @@ class WirelessNetworkEntry(NetworkEntry):
         if os.getuid() != 0:
             try:
                 sudo_prog = misc.choose_sudo_prog()
-                msg = "You must enter your password to configure scripts"
+                msg = "'%s'" % language["scripts_need_pass"]
                 if sudo_prog.endswith("gksu") or sudo_prog.endswith("ktsuss"):
                     msg_flag = "-m"
                 else:
                     msg_flag = "--caption"
-                misc.LaunchAndWait([sudo_prog, msg_flag, msg,
-                                    wpath.lib + "configscript.py", 
-                                    str(self.networkID), "wireless"])
+                misc.LaunchAndWait(' '.join([sudo_prog, msg_flag, msg,
+                                    os.path.join(wpath.lib, "configscript.py"), 
+                                    str(self.networkID), "wireless"]))
             except misc.WicdError:
                 error(None, "Could not find a graphical sudo program." + \
                       "  Script editor could no be launched.")
         else:
-            misc.LaunchAndWait(["./configscript.py", str(self.networkID),
-                               "wireless"])
+            misc.LaunchAndWait(' '.join([os.path.join(wpath.lib, "configscript.py"), 
+                                        str(self.networkID), "wireless"]))
 
     def update_autoconnect(self, widget=None):
         """ Called when the autoconnect checkbox is toggled. """