pidgin: 66a6d81d: Fix compiling gevolution plugin with e-d...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 66a6d81deb1670f42ebd8740cc3c847d944b0668
Ancestor: 513f591a4dac6a954981c9935942889a6bec1f18
Author: nosnilmot at pidgin.im
Date: 2010-05-27T19:59:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/66a6d81deb1670f42ebd8740cc3c847d944b0668

Modified files:
        pidgin/plugins/gevolution/gevolution.c

ChangeLog: 

Fix compiling gevolution plugin with e-d-s >= 2.29.1
Fixes #10852

-------------- next part --------------
============================================================
--- pidgin/plugins/gevolution/gevolution.c	e046efeba8cae10643b9cf565e63589cc820cc91
+++ pidgin/plugins/gevolution/gevolution.c	628b0d63f40b58cd151607270fa7165c5196495d
@@ -36,11 +36,20 @@
 
 #include "gevolution.h"
 
+#if 0
+/* These are private headers that we probably should never have been
+ * including. Maybe very early versions of e-d-s required this?
+ *
+ * also, bonobo has gone away as of e-d-s 2.29.1, and this plugin still
+ * seems to work even on e-d-s 1.10.3 without us touching it.
+ * Maybe it's not really working though. I'm sure we'll find out.
+ */
 #include <libedata-book/Evolution-DataServer-Addressbook.h>
 
 #include <libedata-book/e-data-book-factory.h>
 /* TODO: bonobo is going away eventually, we'll need to find an alternative */
 #include <bonobo/bonobo-main.h>
+#endif
 
 #include <glib.h>
 
@@ -326,7 +335,9 @@ plugin_load(PurplePlugin *plugin)
 static gboolean
 plugin_load(PurplePlugin *plugin)
 {
+#if 0
 	bonobo_activate();
+#endif
 
 	backup_blist_ui_ops = purple_blist_get_ui_ops();
 
@@ -372,7 +383,9 @@ plugin_destroy(PurplePlugin *plugin)
 static void
 plugin_destroy(PurplePlugin *plugin)
 {
+#if 0
 	bonobo_debug_shutdown();
+#endif
 }
 
 static void
@@ -575,14 +588,20 @@ init_plugin(PurplePlugin *plugin)
 	 *
 	 * So, in conclusion, this is an evil hack, but it doesn't harm anything
 	 * and it works.
+	 *
+	 * And for some reason it's needed even when we don't init bonobo ourselves
+	 * at all, so the above explanation is suspect. This is required even with
+	 * e-d-s >= 2.29.1 where bonobo is no longer in the picture.
 	 */
 	g_module_make_resident(plugin->handle);
 
+#if 0
 	if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(),
 						  CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
 	{
 		purple_debug_error("evolution", "Unable to initialize bonobo.\n");
 	}
+#endif
 }
 
 PURPLE_INIT_PLUGIN(gevolution, init_plugin, info)