From: Ed Page <eopage@byu.net>
Date: Thu, 31 Mar 2011 02:32:52 +0000 (-0500)
Subject: Making account number more visible in presence of errors
X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=01fd33aaf43c49935b3d55aa5b38ff3db3369a13

Making account number more visible in presence of errors
---

diff --git a/src/dialcentral_qt.py b/src/dialcentral_qt.py
index 20c3bf5..b819390 100755
--- a/src/dialcentral_qt.py
+++ b/src/dialcentral_qt.py
@@ -551,7 +551,10 @@ class MainWindow(qwrappers.WindowWrapper):
 		self._accountDialog.set_callbacks(
 			self._session.get_callback_numbers(), self._session.get_callback_number()
 		)
-		self._accountDialog.accountNumber = self._session.get_account_number()
+		accountNumberToDisplay = self._session.get_account_number()
+		if not accountNumberToDisplay:
+			accountNumberToDisplay = "Not Available (%s)" % self._session.state
+		self._accountDialog.set_account_number(accountNumberToDisplay)
 		response = self._accountDialog.run(self.window)
 		if response == QtGui.QDialog.Accepted:
 			if self._accountDialog.doClear:
diff --git a/src/dialogs.py b/src/dialogs.py
index 0312ee6..18d97e6 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -251,10 +251,8 @@ class AccountDialog(object):
 			self._voicemailNotificationButton.setVisible(False)
 			self._smsNotificationButton.setVisible(False)
 
-	accountNumber = property(
-		lambda self: str(self._accountNumberLabel.text()),
-		lambda self, num: self._accountNumberLabel.setText(num),
-	)
+	def set_account_number(self, num):
+		self._accountNumberLabel.setText(num)
 
 	notifications = property(
 		lambda self: self._notificationButton.isChecked(),