X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgv_views.py;h=f913557a2604f315eeec210b2af6058d36fcdd2a;hb=1246484c44a994e423aa0d588f66730793f00fe1;hp=bf12585bf62bf98d0b0eee27d1adaa51f2ec8ac8;hpb=7004be81dc06b998063f78ac2b401736d70cdb59;p=gc-dialer

diff --git a/src/gv_views.py b/src/gv_views.py
index bf12585..f913557 100644
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -431,6 +431,7 @@ class SmsEntryDialog(object):
 
 	def _on_send(self, *args):
 		self._dialog.response(gtk.RESPONSE_OK)
+		self._action = self.ACTION_SEND_SMS
 
 	def _on_dial(self, *args):
 		self._dialog.response(gtk.RESPONSE_OK)
@@ -701,7 +702,7 @@ class AccountInfo(object):
 		return True
 
 	def clear(self):
-		self._callbackSelectButton.set_label("No Callback Number")
+		self._set_callback_label("")
 		self.set_account_number("")
 		self._isPopulated = False
 
@@ -756,15 +757,13 @@ class AccountInfo(object):
 						self._backend.get_callback_number(),
 					),
 				)
+				self._set_callback_label(number)
 			else:
 				self._backend.set_callback_number(number)
 				assert make_ugly(number) == make_ugly(self._backend.get_callback_number()), "Callback number should be %s but instead is %s" % (
 					make_pretty(number), make_pretty(self._backend.get_callback_number())
 				)
-				prettyNumber = make_pretty(number)
-				if len(prettyNumber) == 0:
-					prettyNumber = "No Callback Number"
-				self._callbackSelectButton.set_label(prettyNumber)
+				self._set_callback_label(number)
 				_moduleLogger.info(
 					"Callback number set to %s" % (
 						self._backend.get_callback_number(),
@@ -773,6 +772,12 @@ class AccountInfo(object):
 		except Exception, e:
 			self._errorDisplay.push_exception()
 
+	def _set_callback_label(self, uglyNumber):
+		prettyNumber = make_pretty(uglyNumber)
+		if len(prettyNumber) == 0:
+			prettyNumber = "No Callback Number"
+		self._callbackSelectButton.set_label(prettyNumber)
+
 	def _update_alarm_settings(self, recurrence):
 		try:
 			isEnabled = self._notifyCheckbox.get_active()