Changeset b79308b for conf.c

Timestamp:

2008-04-14T13:10:53Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (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:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

File:

• conf.c (modified) (1 diff)

conf.c

@@ -253 +253 @@
                         {
                                 g_strfreev( conf->migrate_storage );
-                                conf->migrate_storage = g_strsplit( ini->value, " \t,;", -1 );
+                                conf->migrate_storage = g_strsplit_set( ini->value, " \t,;", -1 );
                         }
                         else if( g_strcasecmp( ini->key, "pinginterval" ) == 0 )