From: Ed Page <eopage@byu.net>
Date: Thu, 31 Mar 2011 02:47:18 +0000 (-0500)
Subject: Fixing some errors seen when account is cleared
X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=51fac4abe1d256a58d3d62e41dc631eb58795d2b

Fixing some errors seen when account is cleared
---

diff --git a/src/dialcentral_qt.py b/src/dialcentral_qt.py
index b819390..7b2d321 100755
--- a/src/dialcentral_qt.py
+++ b/src/dialcentral_qt.py
@@ -662,6 +662,7 @@ class MainWindow(qwrappers.WindowWrapper):
 	@misc_utils.log_exception(_moduleLogger)
 	def _on_account(self, checked = True):
 		with qui_utils.notify_error(self._errorLog):
+			assert self._session.state == self._session.LOGGEDIN_STATE, "Must be logged in for settings"
 			self._show_account_dialog()
 
 
diff --git a/src/session.py b/src/session.py
index a445788..a50245a 100644
--- a/src/session.py
+++ b/src/session.py
@@ -359,10 +359,13 @@ class Session(QtCore.QObject):
 		return self._dnd
 
 	def get_account_number(self):
+		if self.state != self.LOGGEDIN_STATE:
+			return ""
 		return self._backend[0].get_account_number()
 
 	def get_callback_numbers(self):
-		# @todo Remove evilness (might call is_authed which can block)
+		if self.state != self.LOGGEDIN_STATE:
+			return {}
 		return self._backend[0].get_callback_numbers()
 
 	def get_callback_number(self):