pidgin3: comparison src/protocols/jabber/jabber.c

-:73697fa39752
+:91ad36873636
 */
 static void jabber_remove_gaim_buddy(struct gaim_connection *gc, const char *buddyname)
 {
 	struct buddy *b;
-	if ((b = find_buddy(gc->account, buddyname)) != NULL) {
+	if ((b = gaim_find_buddy(gc->account, buddyname)) != NULL) {
 		debug_printf("removing buddy [1]: %s\n", buddyname);
-		remove_buddy(b);
+		gaim_blist_remove_buddy(b);
 		gaim_blist_save();
 	}
 }
 static void jabber_change_passwd(struct gaim_connection *gc, const char *old, const char *new)
 		static int i = 0x70;
 		if ((jc = find_pending_chat(GJ_GC(gjc), gjid)) != NULL) {
 			jc->b = cnv = serv_got_joined_chat(GJ_GC(gjc), i++, gjid->user);
 			jc->id = gaim_chat_get_id(GAIM_CHAT(jc->b));
 			jc->state = JCS_ACTIVE;
-		} else if ((b = find_buddy(GJ_GC(gjc)->account, buddy)) == NULL) {
+		} else if ((b = gaim_find_buddy(GJ_GC(gjc)->account, buddy)) == NULL) {
 			g_free(buddy);
 			gaim_jid_free(gjid);
 			return;
 		}
 	}
 		jabber_accept_deny_add(jap, "subscribed");
 		/*
 		 * If we don't already have the buddy on *our* buddylist,
 		 * ask if we want him or her added.
 		 */
-		if(find_buddy(jap->gc->account, jap->user) == NULL) {
+		if(gaim_find_buddy(jap->gc->account, jap->user) == NULL) {
 			show_got_added(jap->gc, NULL, jap->user, NULL, NULL);
 		}
 	}
 	g_free(jap->user);
 	/*
 	 * Add or remove a buddy?  Change buddy's alias or group?
 	 */
 	if (BUD_SUB_TO_PEND(sub, ask) || BUD_SUBD_TO(sub, ask)) {
-		if ((b = find_buddy(GJ_GC(gjc)->account, buddyname)) == NULL) {
+		if ((b = gaim_find_buddy(GJ_GC(gjc)->account, buddyname)) == NULL) {
+			struct buddy *b = gaim_buddy_new(GJ_GC(gjc)->account, buddyname, name ? name : NULL);
+			struct group *g;
+			if (groupname) {
+				if (!(g = gaim_find_group(groupname)))
+					g = gaim_group_new(groupname);
+			} else
+				g = gaim_group_new(_("Buddies"));
 			debug_printf("adding buddy [4]: %s\n", buddyname);
-			b = add_buddy(GJ_GC(gjc)->account,
+			gaim_blist_add_buddy(b, g, NULL);
-					groupname ? groupname : _("Buddies"), buddyname,
-					name ? name : buddyname);
 			gaim_blist_save();
 		} else {
-			struct group *c_grp = find_group_by_buddy(b);
+			struct group *c_grp = gaim_find_buddys_group(b);
 			/*
 			 * If the buddy's in a new group or his/her alias is changed...
 			 */
 			if(groupname && c_grp && strcmp(c_grp->name, groupname)) {
 				int signon = b->signon;
 				/*
 				 * seems rude, but it seems to be the only way...
 				 */
-				remove_buddy(b);
+				gaim_blist_remove_buddy(b);
-				b = add_buddy(GJ_GC(gjc)->account, groupname, buddyname,
+				b = gaim_buddy_new(GJ_GC(gjc)->account, buddyname, name ? name : NULL);
-					name ? name : buddyname);
+				gaim_blist_add_buddy(b, gaim_find_group(groupname), NULL);
 				gaim_blist_save();
 				if(present) {
 					serv_got_update(GJ_GC(gjc), buddyname, 1, 0, signon, idle,
 							uc, 0);
 				}
 			} else if(name != NULL && strcmp(b->alias, name)) {
 				g_snprintf(b->alias, sizeof(b->alias), "%s", name);
-				handle_buddy_rename(b, buddyname);
+				gaim_blist_rename_buddy(b, buddyname);
 				gaim_blist_save();
 			}
 		}
 	}  else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
 		jabber_remove_gaim_buddy(GJ_GC(gjc), buddyname);
 		x = jutil_iqnew(JPACKET__SET, NS_ROSTER);
 		y = xmlnode_insert_tag(xmlnode_get_tag(x, "query"), "item");
 		xmlnode_put_attrib(y, "jid", realwho);
-		buddy = find_buddy(gc->account, realwho);
+		buddy = gaim_find_buddy(gc->account, realwho);
 		/*
 		 * See if there's an explict (new?) alias for the buddy or we can pull
 		 * one out of current Gaim buddylist data for him.
 		 */
 		 * See if there's an explict (new?) group for the buddy or pull
 		 * one out of current Gaim buddylist data for him.
 		 */
 		if(group && group[0] != '\0') {
 			my_group = group;
-		} else if((buddy_group = find_group_by_buddy(buddy)) != NULL) {
+		} else if((buddy_group = gaim_find_buddys_group(buddy)) != NULL) {
 			my_group = buddy_group->name;
 		}
 		/*
 		 * Send what group the buddy's in along with the roster item.
 	if(jd->buddies != NULL)
 		g_hash_table_foreach(jd->buddies, set_invisible_to_buddy_status, (gpointer) invisible);
 }
-static char **jabber_list_icon(int uc)
+static const char *jabber_list_icon(struct gaim_account *a, struct buddy *b)
 {
+	return "jabber";
+}
+/*
 	switch (uc) {
 	case UC_AWAY:
 		return available_away_xpm;
 	case UC_CHAT:
 		return available_chat_xpm;
 	case UC_ERROR:
 		return available_error_xpm;
 	default:
 		return available_xpm;
 	}
-}
+	}*/
 static GList *jabber_chat_info(struct gaim_connection *gc)
 {
 	gjconn gjc = ((struct jabber_data *)gc->proto_data)->gjc;
 		debug_printf("joining completely new Jabber chat\n");
 		jc = g_new0(struct jabber_chat, 1);
 		jc->gjid = gjid;
 		jc->gc = gc;
 		((struct jabber_data *)gc->proto_data)->chats = g_slist_append(jcs, jc);
-		add_buddy(gc->account, _("Chats"), realwho, realwho);
+		//	add_buddy(gc->account, _("Chats"), realwho, realwho);
 	}
 	jc->state = JCS_PENDING;
 	x = jutil_presnew(0, realwho, NULL);
 }
 static GList *jabber_buddy_menu(struct gaim_connection *gc, char *who) {
 	GList *m = NULL;
 	struct proto_buddy_menu *pbm;
-	struct buddy *b = find_buddy(gc->account, who);
+	struct buddy *b = gaim_find_buddy(gc->account, who);
 	if(b->uc == UC_ERROR)
 	{
 		pbm = g_new0(struct proto_buddy_menu, 1);
 		pbm->label = _("View Error Msg");

Mercurial > pidgin3 / file comparison

comparison: src/protocols/jabber/jabber.c

src/protocols/jabber/jabber.c