Changeset 703f0f7 for protocols/msn/msn.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/msn/msn.c (modified) (3 diffs)

protocols/msn/msn.c

@@ -26 +26 @@
 #include "nogaim.h"
 #include "msn.h"
-
-static struct prpl *my_protocol = NULL;
 
 static void msn_login( struct aim_user *acct )
@@ -375 +373 @@
 }
 
-void msn_init(struct prpl *ret)
-{
-        ret->protocol = PROTO_MSN;
+void msn_init()
+{
+        struct prpl *ret = g_new0(struct prpl, 1);
+        ret->name = "msn";
         ret->login = msn_login;
         ret->close = msn_close;
@@ -400 +399 @@
         ret->cmp_buddynames = g_strcasecmp;
 
-        my_protocol = ret;
-}
+        register_protocol(ret);
+}