Mercurial > pidgin.yaz
diff src/gtkmain.c @ 12342:0692d20d9d81
[gaim-migrate @ 14646]
sf patch #1361667, from Sadrul Habib Chowdhury
"Gaim currently loads a plugin twice if it exists in
user's home directory, and also in LIBDIR. This can
create confusion in the plugins-dialog -- especially
when someone modifies some plugin and installs in his
home-directory. I think it'd be better to load only the
plugin which is in user's home directory in such cases."
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 05 Dec 2005 04:19:07 +0000 |
| parents | 3ef381cdc47e |
| children | d51cf8896f5c |
line wrap: on
line diff
--- a/src/gtkmain.c Mon Dec 05 04:10:08 2005 +0000 +++ b/src/gtkmain.c Mon Dec 05 04:19:07 2005 +0000 @@ -618,11 +618,14 @@ gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops()); gaim_eventloop_set_ui_ops(gaim_gtk_eventloop_get_ui_ops()); - /* Set plugin search directories */ - gaim_plugins_add_search_path(LIBDIR); + /* + * Set plugin search directories. Give priority to the plugins + * in user's home directory. + */ search_path = g_build_filename(gaim_user_dir(), "plugins", NULL); gaim_plugins_add_search_path(search_path); g_free(search_path); + gaim_plugins_add_search_path(LIBDIR); if (!gaim_core_init(GAIM_GTK_UI)) { fprintf(stderr,