Changeset 69cb623 for conf.c

Timestamp:

2006-10-15T09:41:12Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2529faf

Parents:

695e392 (diff), e97827b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging with storage-xml. It seems to be working pretty well, so maybe
this way more people will test it. :-)

File:

• conf.c (modified) (3 diffs)

conf.c

@@ -34 +34 @@
 #include "ipc.h"
 
-#include "protocols/proxy.h"
+#include "proxy.h"
 
 char *CONF_FILE;
@@ -55 +55 @@
         conf->nofork = 0;
         conf->verbose = 0;
-        conf->primary_storage = "text";
+        conf->primary_storage = "xml";
+        conf->migrate_storage = g_strsplit( "text", ",", -1 );
         conf->runmode = RUNMODE_INETD;
         conf->authmode = AUTHMODE_OPEN;
@@ -322 +323 @@
                 if( g_strcasecmp( ini->section, "defaults" ) == 0 )
                 {
-                        set_t *s = set_find( irc, ini->key );
+                        set_t *s = set_find( &irc->set, ini->key );
                         
                         if( s )