Simplifying some logic to hopefully speed things up

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

diff --git a/src/dc_glade.py b/src/dc_glade.py
index 7a339a6..c63b268 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -151,10 +151,7 @@ class Dialcentral(object):
                else:
                        pass # warnings.warn("No Hildon", UserWarning, 2)
 
-               if hildon is not None:
-                       self._window.set_title("Keypad")
-               else:
-                       self._window.set_title("%s - Keypad" % constants.__pretty_app_name__)
+               self._window.set_title("%s" % constants.__pretty_app_name__)
 
                callbackMapping = {
                        "on_dialpad_quit": self._on_close,
@@ -314,7 +311,7 @@ class Dialcentral(object):
                        with gtk_toolbox.gtk_lock():
                                self.load_settings(config)
 
-                       gtk_toolbox.asynchronous_gtk_message(self._spawn_attempt_login)(2)
+                       self._spawn_attempt_login(2)
                except StandardError, e:
                        warnings.warn(e.message, UserWarning, 2)
                except BaseException, e:
@@ -635,12 +632,6 @@ class Dialcentral(object):
                elif page_num == self.ACCOUNT_TAB:
                        self._accountViews[self._selectedBackendId].update()
 
-               tabTitle = self._notebook.get_tab_label(self._notebook.get_nth_page(page_num)).get_text()
-               if hildon is not None:
-                       self._window.set_title(tabTitle)
-               else:
-                       self._window.set_title("%s - %s" % (constants.__pretty_app_name__, tabTitle))
-
        def _on_sms_clicked(self, number, message):
                assert number
                assert message

diff --git a/src/gv_backend.py b/src/gv_backend.py
index 90d8a30..0b1ca4b 100644 (file)
--- a/src/gv_backend.py
+++ b/src/gv_backend.py
@@ -141,7 +141,7 @@ class GVDialer(object):
                @returns If authenticated
                """
 
-               if (time.time() - self._lastAuthed) < 60 and not force:
+               if (time.time() - self._lastAuthed) < 120 and not force:
                        return True
 
                try:
@@ -288,10 +288,9 @@ class GVDialer(object):
                @returns a dictionary mapping call back numbers to descriptions
                @note These results are cached for 30 minutes.
                """
-               if time.time() - self._lastAuthed < 1800 or self.is_authed():
-                       return self._callbackNumbers
-
-               return {}
+               if not self.is_authed():
+                       return {}
+               return self._callbackNumbers
 
        _setforwardURL = "https://www.google.com//voice/m/setphone"
 
@@ -301,17 +300,19 @@ class GVDialer(object):
                @param callbacknumber should be a proper 10 digit number
                """
                self._callbackNumber = callbacknumber
-               callbackPostData = urllib.urlencode({
-                       '_rnr_se': self._token,
-                       'phone': callbacknumber
-               })
-               try:
-                       callbackSetPage = self._browser.download(self._setforwardURL, callbackPostData)
-               except urllib2.URLError, e:
-                       warnings.warn(traceback.format_exc())
-                       raise RuntimeError("%s is not accesible" % self._setforwardURL)
 
-               self._browser.cookies.save()
+               # Currently this isn't working out in GoogleVoice, but thats ok, we pass the callback on dial
+               #callbackPostData = urllib.urlencode({
+               #       '_rnr_se': self._token,
+               #       'phone': callbacknumber
+               #})
+               #try:
+               #       callbackSetPage = self._browser.download(self._setforwardURL, callbackPostData)
+               #       self._browser.cookies.save()
+               #except urllib2.URLError, e:
+               #       warnings.warn(traceback.format_exc())
+               #       raise RuntimeError("%s is not accesible" % self._setforwardURL)
+
                return True
 
        def get_callback_number(self):