[Gaim-commits] CVS: gaim/plugins/gevolution gevolution.c,1.9,1.10

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/plugins/gevolution
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16429/plugins/gevolution

Modified Files:
	gevolution.c 
Log Message:
Patch by Henry Jen to move bonobo initialization to plugin_init in the 
gevolution plugin, so that we don't have nasty crashes when reloading the 
plugin. Patch #1007696, fixes bug #982076.


Index: gevolution.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/gevolution/gevolution.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -p -r1.9 -r1.10
--- gevolution.c	5 Sep 2004 17:10:38 -0000	1.9
+++ gevolution.c	20 Sep 2004 03:32:57 -0000	1.10
@@ -251,13 +251,6 @@ load_timeout(gpointer data)
 static gboolean
 plugin_load(GaimPlugin *plugin)
 {
-	if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(),
-						  CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
-	{
-		gaim_debug_error("evolution", "Unable to initialize bonobo.\n");
-		return FALSE;
-	}
-
 	bonobo_activate();
 
 	backup_blist_ui_ops = gaim_blist_get_ui_ops();
@@ -298,14 +291,13 @@ plugin_unload(GaimPlugin *plugin)
 		book = NULL;
 	}
 
-	bonobo_debug_shutdown();
-
 	return TRUE;
 }
 
 static void
 plugin_destroy(GaimPlugin *plugin)
 {
+	bonobo_debug_shutdown();
 }
 
 static void
@@ -505,6 +497,12 @@ init_plugin(GaimPlugin *plugin)
 	 * and it works.
 	 */
 	g_module_make_resident(plugin->handle);
+
+	if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(),
+						  CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
+	{
+		gaim_debug_error("evolution", "Unable to initialize bonobo.\n");
+	}
 }
 
 GAIM_INIT_PLUGIN(gevolution, init_plugin, info)