Changeset 8e419cb for protocols/jabber/jabber.c

Timestamp:

2006-01-10T21:35:08Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

a4dc9f7

Parents:

3e91c3e (diff), dd8d4c5 (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 Wilmer

File:

• protocols/jabber/jabber.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -1249 +1249 @@
                         gjab_auth(gjc);
                 } else {
+                        gjab_reqroster(gjc);
                         account_online(GJ_GC(gjc));
-
-                        if (bud_list_cache_exists(GJ_GC(gjc)))
-                                do_import(GJ_GC(gjc), NULL);
-
+                        
                         ((struct jabber_data *)GJ_GC(gjc)->proto_data)->did_import = TRUE;
-
-                        gjab_reqroster(gjc);
                 }
         } else {
@@ -1860 +1856 @@
                         xmlnode_insert_cdata(y, "away", -1);
                         y = xmlnode_insert_tag(x, "status");
-                        {
-                                char *utf8 = str_to_utf8(message);
-                                xmlnode_insert_cdata(y, utf8, -1);
-                                g_free(utf8);
-                        }
+                        xmlnode_insert_cdata(y, message, -1);
                         gc->away = "";
                 } else {