Changeset 4bfca70

Timestamp:

2005-12-17T00:48:35Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

32c632f

Parents:

701acdd4

Message:

Add variable for plugindir rather then always using the define

Files:

• conf.c (modified) (1 diff)
• conf.h (modified) (1 diff)
• protocols/nogaim.c (modified) (2 diffs)

conf.c

@@ -55 +55 @@
         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.h

@@ -41 +41 @@
         char *hostname;
         char *configdir;
+        char *plugindir;
         char *motdfile;
         char *primary_storage;

protocols/nogaim.c

@@ -82 +82 @@
         GError *error = NULL;
 
-        dir = g_dir_open(PLUGINDIR, 0, &error);
+        dir = g_dir_open(global.conf->plugindir, 0, &error);
 
         if (dir) {
@@ -89 +89 @@
 
                 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);