Changeset 5f8ab6a9 for conf.c

Timestamp:

2010-06-03T10:41:03Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

814aa52

Parents:

3f81999 (diff), f9928cb (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:

merge in bitlbee 1.2.5

File:

• conf.c (modified) (4 diffs)

conf.c

@@ -64 +64 @@
         conf->ping_timeout = 300;
         conf->user = NULL;
+        conf->protocols = NULL;
         proxytype = 0;
         
@@ -128 +129 @@
                 {
                         printf( "Usage: bitlbee [-D/-F [-i <interface>] [-p <port>] [-n] [-v]] [-I]\n"
-                                "               [-c <file>] [-d <dir>] [-h]\n"
+                                "               [-c <file>] [-d <dir>] [-x] [-h]\n"
                                 "\n"
                                 "An IRC-to-other-chat-networks gateway\n"
@@ -144 +145 @@
                                 "  -c  Load alternative configuration file\n"
                                 "  -d  Specify alternative user configuration directory\n"
+                                "  -x  Command-line interface to password encryption/hashing\n"
                                 "  -h  Show this help page.\n" );
                         return NULL;
@@ -312 +314 @@
                                 conf->user = g_strdup( ini->value );
                         }
+                        else if( g_strcasecmp( ini->key, "protocols" ) == 0 )
+                        {
+                                g_strfreev( conf->protocols );
+                                conf->protocols = g_strsplit_set( ini->value, " \t,;", -1 );
+                        }
                         else
                         {