Do not use implicit debugging

1 files changed, 11 insertions, 7 deletions

diff --git a/data/usr/bin/ayatana-webmail b/data/usr/bin/ayatana-webmail
index 0ab44db..85b2a3b 100755
--- a/data/usr/bin/ayatana-webmail
+++ b/data/usr/bin/ayatana-webmail
@@ -5,22 +5,17 @@
 #          Robert Tari <robert@tari.in>
 # License: GNU GPL 3 or higher; http://www.gnu.org/licenses/gpl.html
 
-m_bDebug = False
-
 try:
 
     import devpath
-    from ayatanawebmail.appdata import APPDEBUG
-    APPDEBUG.append(True)
-    m_bDebug = True
 
 except:
 
     pass
 
 import sys
-from ayatanawebmail.application import AyatanaWebmail
 from ayatanawebmail.common import isRunning
+from ayatanawebmail.appdata import APPDEBUG
 
 if __name__ == '__main__':
 
@@ -28,4 +23,13 @@ if __name__ == '__main__':
 
         sys.exit(0)
 
-    AyatanaWebmail((len(sys.argv) == 2 and sys.argv[1] == 'debug') or m_bDebug)
+    sDebug = None
+
+    if len(sys.argv) == 2 and (sys.argv[1] == 'info' or sys.argv[1] == 'debug'):
+
+        sDebug = sys.argv[1]
+        APPDEBUG.append(sDebug)
+
+    from ayatanawebmail.application import AyatanaWebmail
+
+    AyatanaWebmail(sDebug)