pidgin: febf4b9b: Don't try to get info for MUC's. Allow ...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: febf4b9b295ca2c17faaa8db3cc410a6d027dc2a
Ancestor: 11ea1799b1892059650fa7dcf6e848a020045e50
Author: paul at aurich.com
Date: 2008-11-29T19:35:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/febf4b9b295ca2c17faaa8db3cc410a6d027dc2a

Modified files:
        ChangeLog libpurple/protocols/jabber/buddy.c

ChangeLog: 

Don't try to get info for MUC's.  Allow getting info for regular JID's and
room particpant JID's.  Fixes #6648.

-------------- next part --------------
============================================================
--- ChangeLog	f24ca216f8df2e6c4e74ae69149f315146c4f214
+++ ChangeLog	27cad8ee21d47b996efa09ba46004357293952f1
@@ -25,6 +25,7 @@ version 2.5.3 (??/??/????):
 	* Gadu-Gadu now validates that UID's are valid (Adam Strzelecki)
 	* Gadu-Gadu now does proper charset translations where needed (Adam
 	  Strzelecki)
+	* Quit trying to get user info for XMPP MUC's (Paul Aurich)
 
 	Pidgin:
 	* On GTK+ 2.14 and higher, we're using the gtk-tooltip-delay setting
============================================================
--- libpurple/protocols/jabber/buddy.c	346d9c11bb092816ff7e414ad9297e342f9d40f4
+++ libpurple/protocols/jabber/buddy.c	9744ae0ad1d6bf32f1b92a36b3097d7c06e1d17d
@@ -1802,12 +1802,21 @@ void jabber_buddy_get_info(PurpleConnect
 void jabber_buddy_get_info(PurpleConnection *gc, const char *who)
 {
 	JabberStream *js = gc->proto_data;
-	char *bare_jid = jabber_get_bare_jid(who);
+	JabberID *jid = jabber_id_new(who);
 
-	if(bare_jid) {
+	if (!jid)
+		return;
+
+	if (jabber_chat_find(js, jid->node, jid->domain)) {
+		/* For a conversation, include the resource (indicates the user). */
+		jabber_buddy_get_info_for_jid(js, who);
+	} else {
+		char *bare_jid = jabber_get_bare_jid(who);
 		jabber_buddy_get_info_for_jid(js, bare_jid);
 		g_free(bare_jid);
 	}
+
+	jabber_id_free(jid);
 }
 
 static void jabber_buddy_set_invisibility(JabberStream *js, const char *who,