Fix mozilla bugs

dalufine · May 6, 2015 · c76c305 · c76c305
1 parent 52f4f96
commit c76c305
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/Windows/src/LaZagne/softwares/browsers/chrome.py b/Windows/src/LaZagne/softwares/browsers/chrome.py
@@ -19,10 +19,10 @@ def run(self):
 		database_path = ''
 		if 'HOMEDRIVE' in os.environ and 'HOMEPATH' in os.environ:
 			# For Win7
-			path_Win7 = os.environ.get('HOMEDRIVE') + os.sep + os.environ.get('HOMEPATH') + '\Local Settings\Application Data\Google\Chrome\User Data\Default\Login Data'
+			path_Win7 = os.environ.get('HOMEDRIVE') + os.environ.get('HOMEPATH') + '\Local Settings\Application Data\Google\Chrome\User Data\Default\Login Data'
 
 			# For XP
-			path_XP = os.environ.get('HOMEDRIVE') + os.sep + os.environ.get('HOMEPATH') + '\AppData\Local\Google\Chrome\User Data\Default\Login Data'
+			path_XP = os.environ.get('HOMEDRIVE') + os.environ.get('HOMEPATH') + '\AppData\Local\Google\Chrome\User Data\Default\Login Data'
 
 			if os.path.exists(path_XP):
 				database_path = path_XP

diff --git a/Windows/src/LaZagne/softwares/browsers/mozilla.py b/Windows/src/LaZagne/softwares/browsers/mozilla.py
@@ -343,6 +343,9 @@ def found_masterpassword(self):
 
 	# main function
 	def run(self):
+		global database_find
+		database_find = False
+
 		self.manage_advanced_options()
 
 		software_name = constant.mozilla_software
@@ -385,13 +388,17 @@ def run(self):
 					masterPwd = self.is_masterpasswd_set()
 
 					# check if passwors are stored on the Json format
-					credentials = JsonDatabase(profile)
+					try:
+						credentials = JsonDatabase(profile)
+					except:
+						database_find = False
 					if not database_find:
 						# check if passwors are stored on the sqlite format
-						credentials = SqliteDatabase(profile)
+						try:
+							credentials = SqliteDatabase(profile)
+						except:
+							database_find = False
 
-					# if not database_find:
-						# print_debug('INFO', 'No credentials file found (logins.json or signons.sqlite) - or empty content')
 					if database_find:
 						print 
 						if masterPwd:

diff --git a/Windows/src/LaZagne/softwares/chats/pidgin.py b/Windows/src/LaZagne/softwares/chats/pidgin.py
@@ -1,4 +1,3 @@
-import WConio
 import xml.etree.cElementTree as ET
 import os
 from config.constant import *

diff --git a/Windows/standalone/laZagne.exe b/Windows/standalone/laZagne.exe