aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/jabber/jabber.c
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/jabber/jabber.c')
-rw-r--r--protocols/jabber/jabber.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index 535607e6..fc419124 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -155,11 +155,6 @@ struct jabber_chat {
#define JCS_CLOSED 3 /* closed */
-static char *jabber_name()
-{
- return "Jabber";
-}
-
#define STATE_EVT(arg) if(gjc->on_state) { (gjc->on_state)(gjc, (arg) ); }
static void jabber_remove_buddy(struct gaim_connection *gc, char *name, char *group);
@@ -2367,13 +2362,13 @@ static GList *jabber_actions()
return m;
}
-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;
ret->login = jabber_login;
@@ -2397,5 +2392,5 @@ void jabber_init(struct prpl *ret)
ret->group_buddy = jabber_group_change;
ret->cmp_buddynames = g_strcasecmp;
- my_protocol = ret;
+ register_protocol (ret);
}