From: stack <stack@inventati.org>
Date: Sun, 8 Jul 2012 18:58:05 +0000 (+0200)
Subject: refactored activateProfile to pass a path instead of a profile name
X-Git-Url: https://v.licheni.net/stack/code/dboxswitch.git/commitdiff_plain/2d03d47d5b90add99fbfdbfdd96653f85d053731?ds=inline;hp=2c94e3c217ecc734c7af00cacccf9451a4f7dedb

refactored activateProfile to pass a path instead of a profile name
---

diff --git a/gui.py b/gui.py
index 56d0802..51e058b 100755
--- a/gui.py
+++ b/gui.py
@@ -125,9 +125,9 @@ class Gui(QtGui.QDialog):
             profiles = self.profileManager.getProfilesList()
 
             for pr in profiles:
-                pr = os.path.basename(pr)
+                #pr is a profile path
                 menuItem_Profile = self.menuProfiles.addAction(pr)
-
+                pr = os.path.basename(pr)
                 #Using lambda function to pass additional arguments to the function, in this case the path of the profile
                 receiver = self.activateProfileAction(pr)
                 self.connect(menuItem_Profile, SIGNAL('triggered()'), receiver)
diff --git a/profhandler.py b/profhandler.py
index 3d3060f..e5abd82 100755
--- a/profhandler.py
+++ b/profhandler.py
@@ -116,15 +116,15 @@ class ProfHandler():
         else:
             return False
 
-    def activateProfile(self, pname):
-        if pname in self.getProfilesList():
+    def activateProfile(self, ppath):
+        if ppath in self.getProfilesList():
             self.stopDropbox()
             try:
-                with open(os.path.join(self.getProfileFolder(), pname)) as pdir:
+                with open(ppath) as pdir:
                     os.unlink(self.getDropboxDirectory())
-                    os.symlink(os.path.join(self.getProfileFolder(), pname), self.getDropboxDirectory())
+                    os.symlink(ppath, self.getDropboxDirectory())
             except IOError as e:
-                raise AppError('Error on activating Profile: '+pname)
+                raise AppError('Error on activating Profile: '+ppath)
             self.startDropbox()
         else:
             raise AppError("Trying to acrivate non existant profile")