Changeset 703f0f7 for protocols/jabber/jabber.c

Timestamp:

2005-12-14T01:17:25Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

547f937

Parents:

22bf64e (diff), 568aaf7 (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 my pluginable branch

File:

• protocols/jabber/jabber.c (modified) (3 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) ); }
@@ -2368 +2363 @@
 }
 
-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 +2393 @@
         ret->cmp_buddynames = g_strcasecmp;
 
-        my_protocol = ret;
-}
+        register_protocol (ret);
+}