Changeset b79308b for set.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:

• set.c (modified) (1 diff)

set.c

@@ -230 +230 @@
         return value;
 }
-
-char *set_eval_charset( set_t *set, char *value )
-{
-        GIConv cd;
-
-        if ( g_strncasecmp( value, "none", 4 ) == 0 )
-                return value;
-
-        cd = g_iconv_open( "UTF-8", value );
-        if( cd == (GIConv) -1 )
-                return NULL;
-
-        g_iconv_close( cd );
-        return value;
-}