Update changelog & UI for 0.8.8

[hermes] / package / src / org / maemo / hermes / gui / gtkui.py

diff --git a/package/src/org/maemo/hermes/gui/gtkui.py b/package/src/org/maemo/hermes/gui/gtkui.py
index a639e72..eed09fc 100644 (file)
--- a/package/src/org/maemo/hermes/gui/gtkui.py
+++ b/package/src/org/maemo/hermes/gui/gtkui.py
@@ -12,8 +12,8 @@ from org.maemo.hermes.gui.contactview import ContactView
 from org.maemo.hermes.gui.mapcontact import MapContact
 from org.maemo.hermes.gui.accountsdialogue import AccountsDialogue
 from org.bleb.wimpworks import HildonMainScreenLayout
-from org.maemo.hermes.engine.syncjob import SyncJob
 from org.maemo.hermes.engine.hermes import Hermes
+from org.maemo.hermes.engine.service import CredentialsExpiredException
 
 class HermesGUI(WimpWorks):
     """Provides the GUI for Hermes, allowing the syncing of Facebook and
@@ -26,7 +26,7 @@ class HermesGUI(WimpWorks):
     # -----------------------------------------------------------------------
     def __init__(self, providers = None):
         gettext.install('hermes','/opt/hermes/share/locale/')
-        WimpWorks.__init__(self, 'Hermes', version = '0.8.2', dbus_name = 'org.maemo.hermes')
+        WimpWorks.__init__(self, 'Hermes', version = '0.8.8', dbus_name = 'org.maemo.hermes')
         self.set_background('background.png')
         
         layout = HildonMainScreenLayout(offset = 0.8, container = self)
@@ -145,6 +145,9 @@ class HermesGUI(WimpWorks):
             except urllib2.URLError, e:
                 traceback.print_exc()
                 gobject.idle_add(self.report_error, _('Network connection error. Check connectivity.'))
+                
+            except CredentialsExpiredException, e:
+                gobject.idle_add(self.report_error, _('Credentials expired. Please reauthorise %s.') % (e.message))
           
             except Exception, e:
                 traceback.print_exc()
@@ -189,6 +192,7 @@ class HermesGUI(WimpWorks):
         view.connect('contact-activated', self.map_contact, fb2c)
         dialog.vbox.add(view)
         dialog.show_all()
+        dialog.vbox.add(view.get_search())
       
         dialog.run()
         dialog.hide()
@@ -202,6 +206,7 @@ class HermesGUI(WimpWorks):
         dialog.add_button(_('Update'), gtk.RESPONSE_OK)
         dialog.vbox.add(view)
         dialog.show_all()
+        dialog.vbox.add(view.get_search())
       
         result = dialog.run()
         dialog.hide()