Removing some code thatll hopefully increase stability

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

diff --git a/src/dc_glade.py b/src/dc_glade.py
index 87ab87e..fec8b22 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -96,7 +96,6 @@ class Dialcentral(object):
                self._osso = None
                self._clipboard = gtk.clipboard_get()
 
-               self._deviceIsOnline = True
                self._credentials = ("", "")
                self._selectedBackendId = self.NULL_BACKEND
                self._defaultBackendId = self.GC_BACKEND
@@ -342,8 +341,6 @@ class Dialcentral(object):
                try:
                        assert 0 <= numOfAttempts, "That was pointless having 0 or less login attempts"
                        assert self._initDone, "Attempting login before app is fully loaded"
-                       if not self._deviceIsOnline:
-                               raise RuntimeError("Unable to login, device is not online")
 
                        serviceId = self.NULL_BACKEND
                        loggedIn = False
@@ -372,8 +369,6 @@ class Dialcentral(object):
                @note Thread agnostic
                """
                assert self._initDone, "Attempting login before app is fully loaded"
-               if not self._deviceIsOnline:
-                       raise RuntimeError("Unable to login, device is not online")
 
                loggedIn = False
                if not loggedIn:
@@ -604,11 +599,9 @@ class Dialcentral(object):
                bearer = event.get_bearer_type()
 
                if status == conic.STATUS_CONNECTED:
-                       self._deviceIsOnline = True
                        if self._initDone:
                                self._spawn_attempt_login(2)
                elif status == conic.STATUS_DISCONNECTED:
-                       self._deviceIsOnline = False
                        if self._initDone:
                                self._defaultBackendId = self._selectedBackendId
                                self._change_loggedin_status(self.NULL_BACKEND)

diff --git a/src/dialcentral.glade b/src/dialcentral.glade
index 0052d33..a7d91fb 100644 (file)
--- a/src/dialcentral.glade
+++ b/src/dialcentral.glade
@@ -765,7 +765,7 @@
                 <child>
                   <widget class="GtkLabel" id="gcnumber_display">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;span size="15000" weight="bold"&gt;(518) 555-1212&lt;/span&gt;</property>
+                    <property name="label" translatable="yes">No Number Available</property>
                     <property name="use_markup">True</property>
                   </widget>
                   <packing>
@@ -779,7 +779,7 @@
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
                     <property name="xpad">5</property>
-                    <property name="label" translatable="yes">GrandCentral
+                    <property name="label" translatable="yes">Google Voice
 Number:</property>
                     <property name="justify">right</property>
                   </widget>

diff --git a/support/builddeb.py b/support/builddeb.py
index 3cf09de..f34a149 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -20,6 +20,7 @@ __build__ = 0
 __changelog__ = '''
 1.0.4
 * Fixed the duplicate title on Maemo
+* Removing some device connection observer code due to high bug to low benefit ratio
 
 1.0.3
 * Holding down a tab for a second will now force a refresh