deskbar-applet r2065 - in trunk: . deskbar/core/updater deskbar/ui/preferences

[sebp svn gnome org]

Author: sebp
Date: Fri Apr  4 14:06:48 2008
New Revision: 2065
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2065&view=rev

Log:
Adjusted to Capuchin API change

Modified:
   trunk/ChangeLog
   trunk/deskbar/core/updater/Capuchin.py
   trunk/deskbar/ui/preferences/DeskbarPreferences.py

Modified: trunk/deskbar/core/updater/Capuchin.py
==============================================================================
--- trunk/deskbar/core/updater/Capuchin.py	(original)
+++ trunk/deskbar/core/updater/Capuchin.py	Fri Apr  4 14:06:48 2008
@@ -46,7 +46,6 @@
 class AppObject (gobject.GObject):
     
     __gsignals__ = {
-        "update-finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
         "install-finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [str]),
         "status": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int, str, float, int]),
                     }
@@ -60,7 +59,6 @@
         
         self.appobject.connect_to_signal('InstallFinished', self.__on_install_finished)
         self.appobject.connect_to_signal('Status', self.__on_status)
-        self.appobject.connect_to_signal('UpdateFinished', self.__on_update_finished)
         
     def __on_install_finished(self, plugin_id):
         self.emit ("install-finished", plugin_id)

Modified: trunk/deskbar/ui/preferences/DeskbarPreferences.py
==============================================================================
--- trunk/deskbar/ui/preferences/DeskbarPreferences.py	(original)
+++ trunk/deskbar/ui/preferences/DeskbarPreferences.py	Fri Apr  4 14:06:48 2008
@@ -199,17 +199,15 @@
         if self.__capuchin == None:
             manager = AppObjectManager ()
             self.__capuchin = manager.get_app_object (DESKBAR_CAPUCHIN_REPO)
-            self.__capuchin.connect ('update-finished', self._on_update_finished)
             self.__capuchin.connect ('install-finished', self._on_install_finished)
             self.__capuchin.connect ('status', self._on_status)
             self.__capuchin.update (False)
+            
+            if self.progessdialog != None:
+                self.progessdialog.destroy()
+                self.progessdialog = None
 
-            # FIXME
-            time.sleep(2)
-
-            return self.__capuchin
-        else:
-            return self.__capuchin
+        return self.__capuchin
        
     def _show_error_dialog(self, error):
           """
@@ -513,12 +511,6 @@
     def on_webmodule_selected(self, selection):
         mod_id = self.webmoduleview.get_selected_module_id()
         self.install.set_sensitive(mod_id != None)
-          
-    def _on_update_finished(self, appobject):
-        self.__capuchin_updated = True
-        if self.progessdialog != None:
-            self.progessdialog.destroy()
-            self.progessdialog = None
     
     def _on_status(self, appobject, action, plugin_id, progress, speed):
         if action == ACTION_UPDATING_REPO: