More gui cleanup

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

diff --git a/Makefile b/Makefile
index a90e9fd..6b5bf81 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,8 +70,6 @@ $(BUILD_PATH): $(BUILD_BIN)
        cp $(SOURCE_PATH)/gc_dialer_64.png $(BUILD_PATH)
        cp $(SOURCE_PATH)/gc_dialer_26.png $(BUILD_PATH)
 
-       cp $(SOURCE_PATH)/gc_contact.png $(BUILD_PATH)
-
        cp $(SOURCE_PATH)/gc_dialer.desktop $(BUILD_PATH)
 
        cp $(SOURCE_PATH)/gc_dialer.glade $(BUILD_PATH)
@@ -88,8 +86,6 @@ $(PRE_PACKAGE_PATH): $(BUILD_PATH)
        cp $(BUILD_PATH)/gc_dialer_64.png $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/64x64/hildon/gc_dialer.png
        cp $(BUILD_PATH)/gc_dialer_26.png $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/26x26/hildon/gc_dialer.png
 
-       cp $(BUILD_PATH)/gc_contact.png $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/scalable/hildon/gc_contact.png
-
        cp $(BUILD_PATH)/gc_dialer.desktop $(PRE_PACKAGE_PATH)/build/usr/share/applications/hildon
 
        cp $(BUILD_PATH)/gc_dialer.glade $(PRE_PACKAGE_PATH)/build/usr/local/lib

diff --git a/src/gc_contact.png b/src/gc_contact.png
deleted file mode 100644 (file)
index df50c66..0000000
Binary files a/src/gc_contact.png and /dev/null differ

diff --git a/src/gc_dialer.py b/src/gc_dialer.py
index e1677f3..bbbb1f6 100755 (executable)
--- a/src/gc_dialer.py
+++ b/src/gc_dialer.py
@@ -268,28 +268,8 @@ class Dialpad(object):
                self._recentmodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
                self._recentviewselection = None
 
-               self._gcContactText = "GC"
-               try:
-                       self._gcContactIcon = gtk.gdk.pixbuf_new_from_file_at_size('gc_contact.png', 16, 16)
-               except gobject.GError:
-                       self._gcContactIcon = None
                self._contactstime = 0.0
-               if self._gcContactIcon is not None:
-                       self._contactsmodel = gtk.ListStore(
-                               gtk.gdk.Pixbuf,
-                               gobject.TYPE_STRING,
-                               gobject.TYPE_STRING,
-                               gobject.TYPE_STRING,
-                               gobject.TYPE_STRING
-                       )
-               else:
-                       self._contactsmodel = gtk.ListStore(
-                               gobject.TYPE_STRING,
-                               gobject.TYPE_STRING,
-                               gobject.TYPE_STRING,
-                               gobject.TYPE_STRING,
-                               gobject.TYPE_STRING
-                       )
+               self._contactsmodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
                self._contactsviewselection = None
 
                for path in Dialpad._glade_files:
@@ -450,16 +430,6 @@ class Dialpad(object):
                # Add the column to the treeview
                column = gtk.TreeViewColumn("Contact")
 
-               if self._gcContactIcon is not None:
-                       iconrenderer = gtk.CellRendererPixbuf()
-                       column.pack_start(iconrenderer, expand=False)
-                       column.add_attribute(iconrenderer, 'pixbuf', 0)
-               else:
-                       warnings.warn("Contact icon unavailable", UserWarning, 1)
-                       textrenderer = gtk.CellRendererText()
-                       column.pack_start(textrenderer, expand=False)
-                       column.add_attribute(textrenderer, 'text', 0)
-
                textrenderer = gtk.CellRendererText()
                column.pack_start(textrenderer, expand=True)
                column.add_attribute(textrenderer, 'text', 1)
@@ -524,11 +494,7 @@ class Dialpad(object):
                contactsview.freeze_child_notify()
                contactsview.set_model(None)
 
-               # get gc icon
-               if self._gcContactIcon is not None:
-                       contactType = (self._gcContactIcon,)
-               else:
-                       contactType = (self._addressBook.factory_short_name(),)
+               contactType = (self._addressBook.factory_short_name(),)
                for contactId, contactName in self._addressBook.get_contacts():
                        self._contactsmodel.append(contactType + (contactName, "", contactId) + ("",))
                        yield

diff --git a/support/DEBIAN/control b/support/DEBIAN/control
index 24b5eed..bc10229 100644 (file)
--- a/support/DEBIAN/control
+++ b/support/DEBIAN/control
@@ -3,7 +3,7 @@ Package: Dialer
 Section: user/Communication
 Priority: Optional
 Depends: python2.5, python2.5-gtk2
-Recommends: python2.5-hildon python-evolution
+Recommends: python2.5-hildon, python-evolution
 Version: 0.0.0
 Architecture: all
 Description: Python frontend to the private Google service Grandcentral