Merge my pluginable branch

1 files changed, 4 insertions, 5 deletions

diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c
index bc2f1235..b828d31c 100644
--- a/protocols/msn/msn.c
+++ b/protocols/msn/msn.c
@@ -26,8 +26,6 @@
 #include "nogaim.h"
 #include "msn.h"
 
-static struct prpl *my_protocol = NULL;
-
 static void msn_login( struct aim_user *acct )
 {
 	struct gaim_connection *gc = new_gaim_conn( acct );
@@ -374,9 +372,10 @@ static int msn_send_typing( struct gaim_connection *gc, char *who, int typing )
 		return( 1 );
 }
 
-void msn_init(struct prpl *ret)
+void msn_init()
 {
-	ret->protocol = PROTO_MSN;
+	struct prpl *ret = g_new0(struct prpl, 1);
+	ret->name = "msn";
 	ret->login = msn_login;
 	ret->close = msn_close;
 	ret->send_im = msn_send_im;
@@ -399,5 +398,5 @@ void msn_init(struct prpl *ret)
 	ret->send_typing = msn_send_typing;
 	ret->cmp_buddynames = g_strcasecmp;
 
-	my_protocol = ret;
+	register_protocol(ret);
 }