pidgin: ba3f5db0: Pass the "real" chat username to the pid...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: ba3f5db0711c5a3b7c5b5510df2e5e3ae5adbbc3
Ancestor: 5351a16ab57aaf40fa894c47258d4ffedbca6363
Author: datallah at pidgin.im
Date: 2008-06-13T04:57:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ba3f5db0711c5a3b7c5b5510df2e5e3ae5adbbc3

Modified files:
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/libxmpp.c pidgin/gtkutils.c

ChangeLog: 

Pass the "real" chat username to the pidgin_retrieve_user_info function.
Get rid of the get_cb_info implementation in the xmpp prpl as it isn't needed.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/buddy.c	ffe92b835210e45df79fbf1859e79014ab48c62b
+++ libpurple/protocols/jabber/buddy.c	1bab8cce3c89bfba6f258e6fcb1cda9c64e0efb8
@@ -1793,22 +1793,6 @@ void jabber_buddy_get_info(PurpleConnect
 	}
 }
 
-void jabber_buddy_get_info_chat(PurpleConnection *gc, int id,
-		const char *resource)
-{
-	JabberStream *js = gc->proto_data;
-	JabberChat *chat = jabber_chat_find_by_id(js, id);
-	char *full_jid;
-
-	if(!chat)
-		return;
-
-	full_jid = g_strdup_printf("%s@%s/%s", chat->room, chat->server, resource);
-	jabber_buddy_get_info_for_jid(js, full_jid);
-	g_free(full_jid);
-}
-
-
 static void jabber_buddy_set_invisibility(JabberStream *js, const char *who,
 		gboolean invisible)
 {
============================================================
--- libpurple/protocols/jabber/buddy.h	76c21a001293a2011e6b482cc9b847e941c7fde6
+++ libpurple/protocols/jabber/buddy.h	9369f73dd8849bb389797d35d50ba7553e7be3c3
@@ -96,8 +96,6 @@ void jabber_buddy_get_info(PurpleConnect
 void jabber_buddy_remove_resource(JabberBuddy *jb, const char *resource);
 const char *jabber_buddy_get_status_msg(JabberBuddy *jb);
 void jabber_buddy_get_info(PurpleConnection *gc, const char *who);
-void jabber_buddy_get_info_chat(PurpleConnection *gc, int id,
-		const char *resource);
 
 GList *jabber_blist_node_menu(PurpleBlistNode *node);
 
============================================================
--- libpurple/protocols/jabber/libxmpp.c	5c61414de3bd23433393d6e3c1f59fed8ef5ade7
+++ libpurple/protocols/jabber/libxmpp.c	d9860fe88aa65e09335a7be30b4da7c7b9bff192
@@ -89,7 +89,7 @@ static PurplePluginProtocolInfo prpl_inf
 	jabber_message_send_chat,		/* chat_send */
 	jabber_keepalive,				/* keepalive */
 	jabber_register_account,		/* register_user */
-	jabber_buddy_get_info_chat,		/* get_cb_info */
+	NULL,							/* get_cb_info */
 	NULL,							/* get_cb_away */
 	jabber_roster_alias_change,		/* alias_buddy */
 	jabber_roster_group_change,		/* group_buddy */
============================================================
--- pidgin/gtkutils.c	5300c83bcc67128b323184570ac4d19d26ace4b4
+++ pidgin/gtkutils.c	22c624f08665eeb041b0827cd90469a93df33818
@@ -1001,13 +1001,14 @@ void pidgin_retrieve_user_info_in_chat(P
 	}
 
 	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(conn->prpl);
+	if (prpl_info != NULL && prpl_info->get_cb_real_name)
+		who = prpl_info->get_cb_real_name(conn, chat, name);
 	if (prpl_info == NULL || prpl_info->get_cb_info == NULL) {
-		pidgin_retrieve_user_info(conn, name);
+		pidgin_retrieve_user_info(conn, who ? who : name);
+		g_free(who);
 		return;
 	}
 
-	if (prpl_info->get_cb_real_name)
-		who = prpl_info->get_cb_real_name(conn, chat, name);
 	show_retrieveing_info(conn, who ? who : name);
 	prpl_info->get_cb_info(conn, chat, name);
 	g_free(who);