diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2010-04-09 02:22:46 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2010-04-09 02:22:46 +0000 |
commit | 09957b4811e82e4aac8daa4049af572c811d5710 (patch) | |
tree | fe5622cd7ad5c0a9d184222cd6a1ffd89ef9dddb /src/main.c | |
parent | 542de44ef8e5a9db37de993bfcc0d556e4da8cd7 (diff) |
also load plug-ins from user plug-in directory.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2534 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 19 |
1 files changed, 12 insertions, 7 deletions
@@ -1099,6 +1099,7 @@ static void register_system_events(void) static void plugin_init(void) { MainWindow *mainwin; + gchar *path; mainwin = main_window_get(); @@ -1171,17 +1172,21 @@ static void plugin_init(void) syl_plugin_signal_connect("plugin-load", G_CALLBACK(load_cb), NULL); + /* loading plug-ins from user plug-in directory */ + path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, PLUGIN_DIR, NULL); + syl_plugin_load_all(path); + g_free(path); + + /* loading plug-ins from system plug-in directory */ #ifdef G_OS_WIN32 - { - gchar *path; - path = g_strconcat(get_startup_dir(), G_DIR_SEPARATOR_S, - "plugins", NULL); - syl_plugin_load_all(path); - g_free(path); - } + path = g_strconcat(get_startup_dir(), G_DIR_SEPARATOR_S, PLUGIN_DIR, + NULL); + syl_plugin_load_all(path); + g_free(path); #else syl_plugin_load_all(PLUGINDIR); #endif + STATUSBAR_POP(mainwin); } |