From: epage <eopage@byu.net>
Date: Thu, 17 Sep 2009 02:26:00 +0000 (+0000)
Subject: Lots of little tweaks to various issues
X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=6ba7868eb3907585a6dce28e11511fad9008a17c

Lots of little tweaks to various issues

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

diff --git a/src/constants.py b/src/constants.py
index 51e3803..a1b9b08 100644
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,7 +3,7 @@ import os
 __pretty_app_name__ = "DialCentral"
 __app_name__ = "dialcentral"
 __version__ = "1.0.6"
-__build__ = 1
+__build__ = 4
 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".dialcentral")
 _user_settings_ = "%s/settings.ini" % _data_path_
diff --git a/src/dc_glade.py b/src/dc_glade.py
index f2b3f71..49b9bf8 100755
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -159,8 +159,8 @@ class Dialcentral(object):
 		"""
 		If something can be done after the UI loads, push it here so it's not blocking the UI
 		"""
+		# Barebones UI handlers
 		try:
-			# Barebones UI handlers
 			import null_backend
 			import null_views
 
@@ -177,8 +177,12 @@ class Dialcentral(object):
 				self._recentViews[self._selectedBackendId].enable()
 				self._messagesViews[self._selectedBackendId].enable()
 				self._contactsViews[self._selectedBackendId].enable()
+		except Exception, e:
+			with gtk_toolbox.gtk_lock():
+				self._errorDisplay.push_exception()
 
-			# Setup maemo specifics
+		# Setup maemo specifics
+		try:
 			try:
 				import osso
 			except (ImportError, OSError):
@@ -205,7 +209,6 @@ class Dialcentral(object):
 				import led_handler
 				self._ledHandler = led_handler.LedHandler()
 
-			# Setup maemo specifics
 			try:
 				import conic
 			except (ImportError, OSError):
@@ -217,8 +220,12 @@ class Dialcentral(object):
 				self._connection.request_connection(conic.CONNECT_FLAG_NONE)
 			else:
 				logging.warning("No connection support")
+		except Exception, e:
+			with gtk_toolbox.gtk_lock():
+				self._errorDisplay.push_exception()
 
-			# Setup costly backends
+		# Setup costly backends
+		try:
 			import gv_backend
 			import file_backend
 			import gv_views
@@ -305,11 +312,11 @@ class Dialcentral(object):
 			config.read(constants._user_settings_)
 			with gtk_toolbox.gtk_lock():
 				self.load_settings(config)
-
-			self._spawn_attempt_login(2)
 		except Exception, e:
 			with gtk_toolbox.gtk_lock():
 				self._errorDisplay.push_exception()
+		finally:
+			self._spawn_attempt_login(2)
 
 	def attempt_login(self, numOfAttempts = 10, force = False):
 		"""
diff --git a/support/builddeb.py b/support/builddeb.py
index 338e49e..7f00e48 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -32,6 +32,7 @@ __changelog__ = """
 * Including a vastly improved py2deb
 * Tweaked sizes of stuff on recent tab
 * Starting some work on rotation support for fremantle
+* Made startup more error resistant
 
 1.0.5
 * Contacts Tab remembers the last address book viewed on restart
@@ -150,7 +151,7 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor
 
 __preremove__ = """#!/bin/sh -e
 
-/usr/lib/dialcentral/alarm_handler.py -d
+python /usr/lib/dialcentral/alarm_handler.py -d || true
 """
 
 
@@ -192,17 +193,18 @@ def build_package(distribution):
 		"python-xml | python2.5-xml",
 		"python-dbus | python2.5-dbus",
 	])
+	maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
 	p.depends += {
-		"chinook": "",
-		"diablo": "",
-		"fremantle": ", python-glade2",
-		"mer": ", python-glade2",
+		"debian": "",
+		"chinook": maemoSpecificDepends,
+		"diablo": maemoSpecificDepends,
+		"fremantle": maemoSpecificDepends,
+		"mer": maemoSpecificDepends,
 	}[distribution]
 	p.recommends = ", ".join([
-		"python-osso | python2.5-osso",
-		"python-hildon | python2.5-hildon",
 	])
 	p.section = {
+		"debian": "comm",
 		"chinook": "communication",
 		"diablo": "user/network",
 		"fremantle": "user/network",
@@ -210,7 +212,7 @@ def build_package(distribution):
 	}[distribution]
 	p.arch = "all"
 	p.urgency = "low"
-	p.distribution = "chinook diablo fremantle mer"
+	p.distribution = "chinook diablo fremantle mer debian"
 	p.repository = "extras"
 	p.changelog = __changelog__
 	p.postinstall = __postinstall__