Missed a spot that made me realize that with how we build, making this a non-member...

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

diff --git a/gc_dialer/gc_dialer.py b/gc_dialer/gc_dialer.py
index b9d04fa..85b79d7 100755 (executable)
--- a/gc_dialer/gc_dialer.py
+++ b/gc_dialer/gc_dialer.py
@@ -216,11 +216,11 @@ class Dialpad(object):
                self._widgetTree.signal_autoconnect(callbackMapping)
                self._widgetTree.get_widget("callbackcombo").get_child().connect("changed", self._on_callbackentry_changed)
 
-               # Defer initalization of recent view
                self._gcBackend = GCDialer()
 
-               self.attemptLogin(2) #@todo maybe we should disable the GUI and defer this?
+               self.attemptLogin(2)
                gobject.idle_add(self._init_grandcentral)
+               # Defer initalization of recent view
                gobject.idle_add(self._init_recent_view)
 
        def _init_grandcentral(self):
@@ -277,7 +277,8 @@ class Dialpad(object):
                dialog = self._widgetTree.get_widget("login_dialog")
 
                while (0 < times) and not self._gcBackend.isAuthed():
-                       if dialog.run() != gtk.RESPONSE_OK:
+                       userResponse = dialog.run()
+                       if userResponse != gtk.RESPONSE_OK:
                                times = 0
                                continue
 
@@ -288,7 +289,7 @@ class Dialpad(object):
                        self._gcBackend.login(username, password)
                        print "hiding dialog"
                        dialog.hide()
-                       times = times - 1
+                       times -= 1
 
                return False
 
@@ -360,7 +361,7 @@ class Dialpad(object):
                @todo Potential blocking on web access, maybe we should defer this or put up a dialog?
                """
                text = makeugly(self._widgetTree.get_widget("callbackcombo").get_child().get_text())
-               if self._gcBackend.validate(text) and text != self._gcBackend.getCallbackNumber():
+               if self._gcBackend.is_valid_syntax(text) and text != self._gcBackend.getCallbackNumber():
                        self._gcBackend.setCallbackNumber(text)
 
        def _on_recentview_row_activated(self, treeview, path, view_column):

diff --git a/gc_dialer/gcbackend.py b/gc_dialer/gcbackend.py
index fb248a6..d0d0e5e 100644 (file)
--- a/gc_dialer/gcbackend.py
+++ b/gc_dialer/gcbackend.py
@@ -18,13 +18,6 @@ from browser_emu import MozillaEmulator
 _validateRe = re.compile("^[0-9]{10,}$")
 
 
-def is_valid_syntax(number):
-       """
-       @returns If This number be called ( syntax validation only )
-       """
-       return _validateRe.match(number) is not None
-
-
 class GCDialer(object):
        """
        This class encapsulates all of the knowledge necessary to interace with the grandcentral servers
@@ -97,7 +90,7 @@ class GCDialer(object):
                self._msg = ""
 
                # If the number is not valid throw exception
-               if not is_valid_syntax(number):
+               if not self.is_valid_syntax(number):
                        raise ValueError('number is not valid')
 
                # No point if we don't have the magic cookie
@@ -130,6 +123,13 @@ class GCDialer(object):
                self._browser.cookies.clear()
                self._browser.cookies.save()
 
+       def is_valid_syntax(self, number):
+               """
+               @returns If This number be called ( syntax validation only )
+               """
+               return _validateRe.match(number) is not None
+
+
        def getAccountNumber(self):
                """
                @returns The grand central phone number