# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1095651177 0
# Node ID 0436734708fa8c3dd170ed34a2fa1a97a6e3ae28
# Parent  ecb2384d4babf4f63dcf1a817996d503e3f6cf62
[gaim-migrate @ 11020]
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.

committer: Tailor Script <tailor@pidgin.im>

diff -r ecb2384d4bab -r 0436734708fa plugins/gevolution/gevolution.c
--- a/plugins/gevolution/gevolution.c	Mon Sep 20 03:23:59 2004 +0000
+++ b/plugins/gevolution/gevolution.c	Mon Sep 20 03:32:57 2004 +0000
@@ -251,13 +251,6 @@
 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 @@
 		book = NULL;
 	}
 
-	bonobo_debug_shutdown();
-
 	return TRUE;
 }
 
 static void
 plugin_destroy(GaimPlugin *plugin)
 {
+	bonobo_debug_shutdown();
 }
 
 static void
@@ -505,6 +497,12 @@
 	 * 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)