deskbar-applet r1972 - in trunk: . deskbar/core deskbar/ui/preferences

[sebp svn gnome org]

Author: sebp
Date: Wed Feb 27 17:38:57 2008
New Revision: 1972
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=1972&view=rev

Log:
Removed useless signal "modules-reloading" from ModuleLoader class.
Fixed bug #518984: Pressing reload button more than once causes an exception. The button is now marked insensitive while re-loading.

Modified:
   trunk/ChangeLog
   trunk/deskbar/core/CoreImpl.py
   trunk/deskbar/core/ModuleLoader.py
   trunk/deskbar/ui/preferences/DeskbarPreferences.py

Modified: trunk/deskbar/core/CoreImpl.py
==============================================================================
--- trunk/deskbar/core/CoreImpl.py	(original)
+++ trunk/deskbar/core/CoreImpl.py	Wed Feb 27 17:38:57 2008
@@ -254,7 +254,6 @@
         self._module_list.clear()
         self._disabled_module_list.clear()
         LOGGER.info("Reloading all modules")
-        self._module_loader.emit("modules-reloading")
         self._module_loader.load_all()
     
     def stop_queries(self):

Modified: trunk/deskbar/core/ModuleLoader.py
==============================================================================
--- trunk/deskbar/core/ModuleLoader.py	(original)
+++ trunk/deskbar/core/ModuleLoader.py	Wed Feb 27 17:38:57 2008
@@ -36,8 +36,6 @@
         "module-not-initialized" : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [gobject.TYPE_PYOBJECT]),
         # Fired when the passed module module has run the stop() method successfully. The module is not usable anymore
         "module-stopped" : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [gobject.TYPE_PYOBJECT]),
-        #Fired when reload_all gets called, but before any reloading actually gets done
-        "modules-reloading" : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
     }
     
     def __init__ (self, dirs, extension=".py"):

Modified: trunk/deskbar/ui/preferences/DeskbarPreferences.py
==============================================================================
--- trunk/deskbar/ui/preferences/DeskbarPreferences.py	(original)
+++ trunk/deskbar/ui/preferences/DeskbarPreferences.py	Wed Feb 27 17:38:57 2008
@@ -32,6 +32,7 @@
     
     def __init__(self, model):
         self._model = model
+        self._model.connect("initialized", self.on_modules_initialized)
         
         self.module_list = self._model.get_module_list()
     
@@ -236,6 +237,7 @@
             self.more_button_callback(self.dialog)
 
     def on_reload_button_clicked(self, button):
+        self.reload_button.set_sensitive(False)
         self._model.reload_all_modules()
     
     def on_module_selected(self, selection):
@@ -438,3 +440,6 @@
             self._model.set_ui_name(deskbar.BUTTON_UI_NAME)
         else:
             self._model.set_ui_name(deskbar.WINDOW_UI_NAME)
+            
+    def on_modules_initialized(self, model):
+        self.reload_button.set_sensitive(True)