conduit r1907 - in trunk: . conduit/modules/EvolutionModule

[jstowers svn gnome org]

Author: jstowers
Date: Tue Feb 24 11:50:53 2009
New Revision: 1907
URL: http://svn.gnome.org/viewvc/conduit?rev=1907&view=rev

Log:
2009-02-25  John Stowers  <john stowers gmail com>

	* conduit/modules/EvolutionModule/EvolutionModule.py:
	Import bonobo, causing bonobo_init() to be called,
	working around an e-d-s policy of lazy initializing
	bonobo on the first call. In our case this call 
	happened from the non Gtk+ thread, causing a 
	hang. The workaround has been incorporated upstream
	so is only necessary for older gnome-python-desktop versions.
	Fixes #561354



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/EvolutionModule/EvolutionModule.py

Modified: trunk/conduit/modules/EvolutionModule/EvolutionModule.py
==============================================================================
--- trunk/conduit/modules/EvolutionModule/EvolutionModule.py	(original)
+++ trunk/conduit/modules/EvolutionModule/EvolutionModule.py	Tue Feb 24 11:50:53 2009
@@ -23,6 +23,9 @@
                 "EvoMemoTwoWay"     : { "type": "dataprovider" },
         }
         log.info("Module Information: %s" % Utils.get_module_information(evolution, '__version__'))
+    if evolution.__version__ <= (2,2,2):
+        #Work around bug #561354
+        import bonobo
 except ImportError:
     log.info("Evolution support disabled")