gnome-python-desktop r546 - trunk/evolution

[gjc svn gnome org]

Author: gjc
Date: Tue Feb 24 11:07:56 2009
New Revision: 546
URL: http://svn.gnome.org/viewvc/gnome-python-desktop?rev=546&view=rev

Log:
Automatically import bonobo during evolution modules initialization, to avoid certain problems (see #561354).

Modified:
   trunk/evolution/ebookmodule.c
   trunk/evolution/ecalmodule.c

Modified: trunk/evolution/ebookmodule.c
==============================================================================
--- trunk/evolution/ebookmodule.c	(original)
+++ trunk/evolution/ebookmodule.c	Tue Feb 24 11:07:56 2009
@@ -33,9 +33,11 @@
 {
     PyObject *m, *d;
 
-    /* perform any initialisation required by the library here */
-	init_pygobject();
-	//init();
+    if (!pygobject_init(-1, -1, -1))
+        return;
+    PyImport_ImportModule("bonobo");
+    if (PyErr_Occurred())
+        return;    
 	
     m = Py_InitModule("ebook", pyebook_functions);
     d = PyModule_GetDict(m);

Modified: trunk/evolution/ecalmodule.c
==============================================================================
--- trunk/evolution/ecalmodule.c	(original)
+++ trunk/evolution/ecalmodule.c	Tue Feb 24 11:07:56 2009
@@ -33,8 +33,11 @@
     PyObject *m, *d;
 
     /* perform any initialisation required by the library here */
-	init_pygobject();
-	//init();
+    if (!pygobject_init(-1, -1, -1))
+        return;
+    PyImport_ImportModule("bonobo");
+    if (PyErr_Occurred())
+        return;    
 	
     m = Py_InitModule("ecal", pyecal_functions);
     d = PyModule_GetDict(m);