Fixing an issue with get_value and changing the priority of what sources I pull from...

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

diff --git a/src/hildonize.py b/src/hildonize.py
index 5696b86..a95a4ac 100644 (file)
--- a/src/hildonize.py
+++ b/src/hildonize.py
@@ -672,19 +672,17 @@ def _null_touch_selector_entry(parent, title, items, defaultItem):
                response = dialog.run()
 
                if response == gtk.RESPONSE_OK:
-                       print result
-                       if result[0] is not None:
-                               return result[0]
+                       _, itr = selection.get_selected()
+                       if itr is not None:
+                               return model.get_value(itr, 0)
                        else:
-                               _, itr = selection.get_selected()
-                               if itr is not None:
-                                       return model.get_value(itr)[0]
+                               enteredText = customEntry.get_text().strip()
+                               if enteredText:
+                                       return enteredText
+                               elif result[0] is not None:
+                                       return result[0]
                                else:
-                                       enteredText = customEntry.get_text().strip()
-                                       if enteredText:
-                                               return enteredText
-                                       else:
-                                               raise RuntimeError("No selection made")
+                                       raise RuntimeError("No selection made")
                elif response == gtk.RESPONSE_CANCEL or response == gtk.RESPONSE_DELETE_EVENT:
                        raise RuntimeError("User cancelled request")
                else: