From: brontide <ericew@gmail.com>
Date: Tue, 1 Jul 2008 15:26:30 +0000 (+0000)
Subject: Cleaner syntax for conditional imports found on maemo site
X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=dfe2c0d10eb0e63e23c6b1e0378a7b5808a5feef

Cleaner syntax for conditional imports found on maemo site

git-svn-id: file:///svnroot/gc-dialer/trunk@37 c39d3808-3fe2-4d86-a59f-b7f623ee9f21
---

diff --git a/build_script.sh b/build_script.sh
index 482133a..31d9a58 100755
--- a/build_script.sh
+++ b/build_script.sh
@@ -37,7 +37,7 @@ sed -i 's/^[ \t]*//;s/[ \t]*$//;s/GtkWindow/HildonWindow/' build/usr/local/lib/g
 echo "#!/usr/bin/python" > build/usr/local/bin/gc_dialer.py
 #echo "from __future__ import with_statement" >> build/usr/local/bin/gc_dialer.py
 cat gc_dialer/gc_dialer.py gc_dialer/gcbackend.py gc_dialer/browser_emu.py | grep -e '^import ' | sort -u >> build/usr/local/bin/gc_dialer.py
-echo "import hildon" >> build/usr/local/bin/gc_dialer.py
+#echo "import hildon" >> build/usr/local/bin/gc_dialer.py
 #echo "import osso" >> build/usr/local/bin/gc_dialer.py
 #echo "import abook" >> build/usr/local/bin/gc_dialer.py
 #echo "import evolution.ebook as evo" >> build/usr/local/bin/gc_dialer.py
diff --git a/gc_dialer/gc_dialer.py b/gc_dialer/gc_dialer.py
index 3ddd317..733ef17 100755
--- a/gc_dialer/gc_dialer.py
+++ b/gc_dialer/gc_dialer.py
@@ -20,14 +20,15 @@ import gtk
 import gc
 try:
 	import hildon
-except:
-	pass
+except ImportError:
+	hildon = None
 
 try:
 	import doctest
 	import optparse
-except:
-	pass
+except ImportError:
+	doctest = None
+	optparse = None
 
 from gcbackend import GCDialer
 
@@ -130,11 +131,8 @@ class Dialpad(object):
 		self.setNumber("")
 		self.notebook = self.wTree.get_object("notebook")
 
-		self.isHildon = False
-
 		self.window = self.wTree.get_object("Dialpad")
-		#if True:
-		try:
+		if hildon:
 			#self.osso = osso.Context("gc_dialer", "0.6.0", False)
 			#device = osso.DeviceState(self.osso)
 			#device.set_device_state_callback(self.on_device_state_change, None)
@@ -146,9 +144,6 @@ class Dialpad(object):
 			self.wTree.get_object("callbackentry").set_property('hildon-input-mode', (1 << 4))
 			self.wTree.get_object("usernameentry").set_property('hildon-input-mode', 7)
 			self.wTree.get_object("passwordentry").set_property('hildon-input-mode', 7)
-			self.isHildon = True
-		except:
-			print "No hildon"
 
 		if self.window:
 			self.window.connect("destroy", gtk.main_quit)
@@ -224,7 +219,7 @@ class Dialpad(object):
 			gobject.idle_add(self.populate_recentview)
 		elif page_num ==2 and self.callbackNeedsSetup:
 			gobject.idle_add(self.setupCallbackCombo)
-		if self.isHildon:
+		if hildon:
 			try:
 				self.window.set_title(self.notebook.get_tab_label(self.notebook.get_nth_page(page_num)).get_text())
 			except:
@@ -243,6 +238,8 @@ class Dialpad(object):
 		self.gcd.reset()
 		self.callbackNeedsSetup = True
 		self.recenttime = 0.0
+		self.recentmodel.clear()
+		self.wTree.get_object("callbackentry").set_text("")
 	
 		# re-run the inital grandcentral setup
 		self.attemptLogin(2)
@@ -382,10 +379,8 @@ class DummyOptions(object):
 
 
 if __name__ == "__main__":
-	try:
+	if hildon:
 		gtk.set_application_name("Dialer")
-	except:
-		pass
 
 	try:
 		parser = optparse.OptionParser()