Bug fixes and by popular demand removing the contact list symbol

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

diff --git a/src/dc_glade.py b/src/dc_glade.py
index 9713824..d30af31 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -81,7 +81,7 @@ class Dialcentral(object):
                self._recentViews = None
                self._contactsViews = None
 
-               for path in Dialcentral._glade_files:
+               for path in self._glade_files:
                        if os.path.isfile(path):
                                self._widgetTree = gtk.glade.XML(path)
                                break
@@ -391,13 +391,11 @@ class Dialcentral(object):
                bearer = event.get_bearer_type()
 
                if status == conic.STATUS_CONNECTED:
-                       self._window.set_sensitive(True)
                        self._deviceIsOnline = True
                        backgroundLogin = threading.Thread(target=self.attempt_login, args=[2])
                        backgroundLogin.setDaemon(True)
                        backgroundLogin.start()
                elif status == conic.STATUS_DISCONNECTED:
-                       self._window.set_sensitive(False)
                        self._deviceIsOnline = False
                        self._defaultBackendId = self._selectedBackendId
                        self._change_loggedin_status(self.NULL_BACKEND)

diff --git a/src/gc_views.py b/src/gc_views.py
index 672b870..b6cd02c 100644 (file)
--- a/src/gc_views.py
+++ b/src/gc_views.py
@@ -736,8 +736,9 @@ class ContactsView(object):
                        finally:
                                gtk.gdk.threads_leave()
                for contactId, contactName in contacts:
-                       contactType = (addressBook.contact_source_short_name(contactId),)
-                       self._contactsmodel.append(contactType + (contactName, "", contactId) + ("",))
+                       # contactType = (addressBook.contact_source_short_name(contactId), )
+                       contactType = ("", ) # Due to popular demand
+                       self._contactsmodel.append(contactType + (contactName, "", contactId) + ("", ))
 
                # restart the treeview data rendering
                self._contactsview.set_model(self._contactsmodel)