/soc/2013/ankitkv/gobjectification: bfb60fd48059: Add LIBDIR to ...

Ankit Vani a at nevitus.org
Sat Aug 10 08:12:18 EDT 2013


Changeset: bfb60fd48059393c6b139cc85e7e9d41a71a91a4
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-08-10 15:59 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/bfb60fd48059

Description:

Add LIBDIR to pidgin and finch search paths

diffstat:

 finch/finch.c    |  4 +++-
 pidgin/gtkmain.c |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (30 lines):

diff --git a/finch/finch.c b/finch/finch.c
--- a/finch/finch.c
+++ b/finch/finch.c
@@ -373,8 +373,10 @@ init_libpurple(int argc, char **argv)
 	if (!g_stat(path, &st))
 		g_mkdir(path, S_IRUSR | S_IWUSR | S_IXUSR);
 	purple_plugins_add_search_path(path);
+	g_free(path);
+
+	purple_plugins_add_search_path(LIBDIR);
 	purple_plugins_refresh();
-	g_free(path);
 
 	/* TODO: should this be moved into finch_prefs_init() ? */
 	finch_prefs_update_old();
diff --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c
--- a/pidgin/gtkmain.c
+++ b/pidgin/gtkmain.c
@@ -759,8 +759,10 @@ int main(int argc, char *argv[])
 	if (!g_stat(search_path, &st))
 		g_mkdir(search_path, S_IRUSR | S_IWUSR | S_IXUSR);
 	purple_plugins_add_search_path(search_path);
+	g_free(search_path);
+
+	purple_plugins_add_search_path(LIBDIR);
 	purple_plugins_refresh();
-	g_free(search_path);
 
 	if (opt_si && !purple_core_ensure_single_instance()) {
 #ifdef HAVE_DBUS



More information about the Commits mailing list