deskbar-applet r2045 - in branches/gnome-2-22: . deskbar/core deskbar/ui/preferences

[sebp svn gnome org]

Author: sebp
Date: Fri Mar 28 17:18:03 2008
New Revision: 2045
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2045&view=rev

Log:
Fixed: Error dialog appears when installing a valid module after an invalid one has been installed.
ErrorDialog is no longer resizable

Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/deskbar/core/ModuleInstaller.py
   branches/gnome-2-22/deskbar/ui/preferences/ErrorDialog.py

Modified: branches/gnome-2-22/deskbar/core/ModuleInstaller.py
==============================================================================
--- branches/gnome-2-22/deskbar/core/ModuleInstaller.py	(original)
+++ branches/gnome-2-22/deskbar/core/ModuleInstaller.py	Fri Mar 28 17:18:03 2008
@@ -110,9 +110,6 @@
     
     def __init__(self, module_loader):        
         self.module_loader = module_loader
-        self.delete_original = True
-        self.local_path = None
-        self.error = None
         
     def cleanup(self):
         """
@@ -139,6 +136,7 @@
         @type uri_string: str
         """
         do_cleanup = False
+        self._reset()
         
         uri = gnomevfs.URI(uri_string)
         if (uri.is_local == 1):
@@ -166,3 +164,9 @@
         
         if do_cleanup:
             self.cleanup()
+            
+    def _reset(self):
+        self.error = None
+        self.delete_original = True
+        self.local_path = None
+        

Modified: branches/gnome-2-22/deskbar/ui/preferences/ErrorDialog.py
==============================================================================
--- branches/gnome-2-22/deskbar/ui/preferences/ErrorDialog.py	(original)
+++ branches/gnome-2-22/deskbar/ui/preferences/ErrorDialog.py	Fri Mar 28 17:18:03 2008
@@ -14,6 +14,7 @@
         self.set_decorated(True)
         self.set_has_separator(False)
         self.set_border_width(6)
+        self.set_resizable(False)
         self.vbox.set_spacing(12)
         self.action_area.set_layout(gtk.BUTTONBOX_SPREAD)