Changeset 601e813 for protocols/jabber/jabber.c

Timestamp:

2006-05-24T23:04:18Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

80c1e4d

Parents:

46ad029 (diff), fc630f9 (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] Wilmer

File:

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

protocols/jabber/jabber.c

@@ -1045 +1045 @@
          */
         if(find_buddy(GJ_GC(jap->gjc), jap->user) == NULL) {
-                show_got_added(GJ_GC(jap->gjc), NULL, jap->user, NULL, NULL);
+                show_got_added(GJ_GC(jap->gjc), jap->user, NULL);
         }
         g_free(jap->user);
@@ -1232 +1232 @@
         }
 
-        x = jutil_presnew(0, NULL, "Online");
-        gjab_send(gjc, x);
-        xmlnode_free(x);
+        account_online(GJ_GC(gjc));
 }
 
@@ -1250 +1248 @@
                 } else {
                         gjab_reqroster(gjc);
-                        account_online(GJ_GC(gjc));
                         
                         ((struct jabber_data *)GJ_GC(gjc)->proto_data)->did_import = TRUE;
@@ -1552 +1549 @@
         if(jd->gjc != NULL) {
                 gjab_delete(jd->gjc);
+                /* YAY for modules with their own memory pool managers!...
                 g_free(jd->gjc->sid);
+                And a less sarcastic yay for valgrind. :-) */
                 jd->gjc = NULL;
         }
@@ -1888 +1887 @@
 }
 
-static void jabber_set_idle(struct gaim_connection *gc, int idle) {
-        struct jabber_data *jd = (struct jabber_data *)gc->proto_data;
-        jd->idle = idle ? time(NULL) - idle : idle;
-}
-
 static void jabber_keepalive(struct gaim_connection *gc) {
         struct jabber_data *jd = (struct jabber_data *)gc->proto_data;
         gjab_send_raw(jd->gjc, "  \t  ");
-}
-
-static void jabber_buddy_free(struct buddy *b)
-{
-        while (b->proto_data) {
-                g_free(((GSList *)b->proto_data)->data);
-                b->proto_data = g_slist_remove(b->proto_data, ((GSList *)b->proto_data)->data);
-        }
 }
 
@@ -2341 +2327 @@
 }
 
-
-static GList *jabber_actions()
-{
-        GList *m = NULL;
-
-        m = g_list_append(m, _("Set User Info"));
-        /*
-        m = g_list_append(m, _("Set Dir Info"));
-        m = g_list_append(m, _("Change Password"));
-         */
-
-        return m;
-}
-
-
 void jabber_init()
 {
         struct prpl *ret = g_new0(struct prpl, 1);
 
-        /* the NULL's aren't required but they're nice to have */
         ret->name = "jabber";
         ret->away_states = jabber_away_states;
-        ret->actions = jabber_actions;
         ret->login = jabber_login;
         ret->close = jabber_close;
@@ -2371 +2340 @@
         ret->set_away = jabber_set_away;
         ret->get_away = jabber_get_away_msg;
-        ret->set_idle = jabber_set_idle;
         ret->add_buddy = jabber_add_buddy;
         ret->remove_buddy = jabber_remove_buddy;
-        ret->add_permit = NULL;
-        ret->add_deny = NULL;
-        ret->rem_permit = NULL;
-        ret->rem_deny = NULL;
-        ret->set_permit_deny = NULL;
         ret->keepalive = jabber_keepalive;
-        ret->buddy_free = jabber_buddy_free;
         ret->alias_buddy = jabber_roster_update;
         ret->group_buddy = jabber_group_change;