Fixing some bugs related to callback

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

diff --git a/src/gv_views.py b/src/gv_views.py
index d91bab2..b9c9376 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -744,7 +744,11 @@ class AccountInfo(object):
                del self._callbackList[:]
 
        def get_selected_callback_number(self):
-               return make_ugly(self._callbackSelectButton.get_label())
+               currentLabel = self._callbackSelectButton.get_label()
+               if currentLabel is not None:
+                       return make_ugly(currentLabel)
+               else:
+                       return ""
 
        def set_account_number(self, number):
                """
@@ -800,8 +804,8 @@ class AccountInfo(object):
                for number, description in callbackNumbers.iteritems():
                        self._callbackList.append(make_pretty(number))
 
-               callbackNumber = self._defaultCallback
-               self._callbackSelectButton.set_label(make_pretty(callbackNumber))
+               if not self.get_selected_callback_number():
+                       self._set_callback_number(self._defaultCallback)
 
        def _set_callback_number(self, number):
                try:
@@ -818,6 +822,7 @@ class AccountInfo(object):
                                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())
                                )
+                               self._callbackSelectButton.set_label(make_pretty(number))
                                logging.info(
                                        "Callback number set to %s" % (
                                                self._backend.get_callback_number(),

diff --git a/src/hildonize.py b/src/hildonize.py
index 98f848f..5db8861 100644 (file)
--- a/src/hildonize.py
+++ b/src/hildonize.py
@@ -519,10 +519,7 @@ def _hildon_touch_selector_entry(parent, title, items, defaultItem):
 
        if response == gtk.RESPONSE_OK:
                selectedIndex = selector.get_active(0)
-               if 0 < selectedIndex:
-                       return items[selectedIndex]
-               else:
-                       return selector.get_entry().get_text()
+               return selector.get_entry().get_text()
        elif response == gtk.RESPONSE_CANCEL or response == gtk.RESPONSE_DELETE_EVENT:
                raise RuntimeError("User cancelled request")
        else:

diff --git a/support/builddeb.py b/support/builddeb.py
index ad5b063..66285fa 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -43,6 +43,7 @@ __changelog__ = """
 * Bug Fix: dependencies for fremantle
 * Bug Fix: Issues when trying to stack error messages
 * Bug Fix: Python2.6 deprecates some stuff I did
+* Bug Fix: On refreshing the Accounts tab, the callback number resets to the number from startup
 
 1.0.5
 * Contacts Tab remembers the last address book viewed on restart