Prepping for some fixes and removing dead code

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

diff --git a/src/gv_views.py b/src/gv_views.py
index 21e126c..d4e215f 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -19,6 +19,7 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 @todo Alternate UI for dialogs (stackables)
+@todo Get descriptions with the callback number
 """
 
 from __future__ import with_statement
@@ -805,7 +806,7 @@ class AccountInfo(object):
                        return
 
                for number, description in callbackNumbers.iteritems():
-                       self._callbackList.append(make_pretty(number))
+                       self._callbackList.append((make_pretty(number), description))
 
                if not self.get_selected_callback_number():
                        self._set_callback_number(self._defaultCallback)
@@ -851,7 +852,7 @@ class AccountInfo(object):
                        userSelection = hildonize.touch_selector_entry(
                                self._window,
                                "Callback Number",
-                               self._callbackList,
+                               [number for number, description in self._callbackList],
                                actualSelection,
                        )
                        number = make_ugly(userSelection)

diff --git a/src/hildonize.py b/src/hildonize.py
index 391b365..2219703 100644 (file)
--- a/src/hildonize.py
+++ b/src/hildonize.py
@@ -518,7 +518,6 @@ def _hildon_touch_selector_entry(parent, title, items, defaultItem):
                dialog.hide()
 
        if response == gtk.RESPONSE_OK:
-               selectedIndex = selector.get_active(0)
                return selector.get_entry().get_text()
        elif response == gtk.RESPONSE_CANCEL or response == gtk.RESPONSE_DELETE_EVENT:
                raise RuntimeError("User cancelled request")