Changes in protocols/jabber/jabber.c [027d2eb:a252c1a]

File:

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

protocols/jabber/jabber.c

@@ -155 +155 @@
 #define JCS_CLOSED  3   /* closed */
 
-
-static char *jabber_name()
-{
-        return "Jabber";
-}
 
 #define STATE_EVT(arg) if(gjc->on_state) { (gjc->on_state)(gjc, (arg) ); }
@@ -1254 +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 {
@@ -1865 +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 {
@@ -2368 +2355 @@
 }
 
-static struct prpl *my_protocol = NULL;
-
-void jabber_init(struct prpl *ret)
-{
+
+void jabber_init()
+{
+        struct prpl *ret = g_new0(struct prpl, 1);
+
         /* the NULL's aren't required but they're nice to have */
-        ret->protocol = PROTO_JABBER;
-        ret->name = jabber_name;
+        ret->name = "jabber";
         ret->away_states = jabber_away_states;
         ret->actions = jabber_actions;
@@ -2398 +2385 @@
         ret->cmp_buddynames = g_strcasecmp;
 
-        my_protocol = ret;
-}
+        register_protocol (ret);
+}