From 4bfca70ab85926364682a11aef5f921eb337cf54 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 17 Dec 2005 01:48:35 +0100 Subject: Add variable for plugindir rather then always using the define --- conf.c | 1 + conf.h | 1 + protocols/nogaim.c | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conf.c b/conf.c index 10c6911f..15055ca3 100644 --- a/conf.c +++ b/conf.c @@ -54,6 +54,7 @@ conf_t *conf_load( int argc, char *argv[] ) conf->authmode = AUTHMODE_OPEN; conf->password = NULL; conf->configdir = g_strdup( CONFIG ); + conf->plugindir = g_strdup( PLUGINDIR ); conf->motdfile = g_strdup( ETCDIR "/motd.txt" ); conf->ping_interval = 180; conf->ping_timeout = 300; diff --git a/conf.h b/conf.h index ea9de150..c5b2455f 100644 --- a/conf.h +++ b/conf.h @@ -40,6 +40,7 @@ typedef struct conf char *password; char *hostname; char *configdir; + char *plugindir; char *motdfile; char *primary_storage; char **migrate_storage; diff --git a/protocols/nogaim.c b/protocols/nogaim.c index 4966a76f..29ae860a 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -81,14 +81,14 @@ void load_plugins(void) GDir *dir; GError *error = NULL; - dir = g_dir_open(PLUGINDIR, 0, &error); + dir = g_dir_open(global.conf->plugindir, 0, &error); if (dir) { const gchar *entry; char *path; while ((entry = g_dir_read_name(dir))) { - path = g_build_filename(PLUGINDIR, entry, NULL); + path = g_build_filename(global.conf->plugindir, entry, NULL); if(!path) { log_message(LOGLVL_WARNING, "Can't build path for %s\n", entry); continue; -- cgit v1.2.3