[Commits] callbacks.c 1.19 1.20

colin at claws-mail.org colin at claws-mail.org
Sun Apr 1 20:24:07 CEST 2012


Update of /home/claws-mail/contacts/src
In directory srv:/tmp/cvs-serv9504/src

Modified Files:
	callbacks.c 
Log Message:
2012-04-01 [colin]	0.6.0cvs83

	* configure.ac
	* src/callbacks.c
		Make things easier for new users migrating from old 
		Claws Mail's addressbook : build (and load by default)
		both XML and LDAP plugins

Index: callbacks.c
===================================================================
RCS file: /home/claws-mail/contacts/src/callbacks.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- callbacks.c	25 Mar 2012 22:52:38 -0000	1.19
+++ callbacks.c	1 Apr 2012 18:24:05 -0000	1.20
@@ -449,7 +449,19 @@
 
 	
 	config_get_value(config, PLUGINGROUP, "plugins", &plugins);
-	
+	if (plugins == NULL) {
+#ifdef BUILD_XML_PLUGIN
+		plugins = g_slist_prepend(plugins,
+				g_strconcat(PLUGINDIR, G_DIR_SEPARATOR_S,
+					"xml-plugin.so", NULL));
+#endif
+#ifdef BUILD_LDAP_PLUGIN
+		plugins = g_slist_prepend(plugins,
+				g_strconcat(PLUGINDIR, G_DIR_SEPARATOR_S,
+					"ldap-plugin.so", NULL));
+#endif
+	}
+
 	if (mainwindow) {
 		window = mainwindow->window; 
 		config_get_value(config, "Settings", "default book", &book);
@@ -2292,4 +2304,4 @@
 	}
 	
 	return FALSE;
-}
\ No newline at end of file
+}



More information about the Commits mailing list