- Timestamp:
- 2010-03-17T15:15:19Z (14 years ago)
- Branches:
- master
- Children:
- 60e4df3
- Parents:
- 1c3008a (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
conf.c
r1c3008a re8c8d00 66 66 conf->ft_max_kbps = G_MAXUINT; 67 67 conf->ft_listen = NULL; 68 conf->protocols = NULL; 68 69 proxytype = 0; 69 70 … … 130 131 { 131 132 printf( "Usage: bitlbee [-D/-F [-i <interface>] [-p <port>] [-n] [-v]] [-I]\n" 132 " [-c <file>] [-d <dir>] [- h]\n"133 " [-c <file>] [-d <dir>] [-x] [-h]\n" 133 134 "\n" 134 135 "An IRC-to-other-chat-networks gateway\n" … … 146 147 " -c Load alternative configuration file\n" 147 148 " -d Specify alternative user configuration directory\n" 149 " -x Command-line interface to password encryption/hashing\n" 148 150 " -h Show this help page.\n" ); 149 151 return NULL; … … 333 335 conf->ft_listen = g_strdup( ini->value ); 334 336 } 337 else if( g_strcasecmp( ini->key, "protocols" ) == 0 ) 338 { 339 g_strfreev( conf->protocols ); 340 conf->protocols = g_strsplit_set( ini->value, " \t,;", -1 ); 341 } 335 342 else 336 343 {
Note: See TracChangeset
for help on using the changeset viewer.