[ekg2-commit] r3872 - trunk/plugins/jabber: trunk/plugins/jabber/jabber.c trunk/plugins/jabber/jabber_handlers_iq_result.c

[SVN commit]

Author: peres
Date: 2008-03-09 01:31:52 +0100 (Sun, 09 Mar 2008)
New Revision: 3872

Modified:
   trunk/plugins/jabber/jabber.c
   trunk/plugins/jabber/jabber_handlers_iq_result.c
Log:

If vCard has got a photo attached, point out user to nearest vCard viewing service.



Modified: trunk/plugins/jabber/jabber.c
===================================================================
--- trunk/plugins/jabber/jabber.c	2008-03-08 23:30:43 UTC (rev 3871)
+++ trunk/plugins/jabber/jabber.c	2008-03-09 00:31:52 UTC (rev 3872)
@@ -1376,6 +1376,7 @@
 	format_add("jabber_userinfo_adr_country",	_("%g|| || %n    Country: %T%2"), 1);
 	format_add("jabber_userinfo_adr_end",		_("%g|| %g`+=%G-----"), 1);
 
+	format_add("jabber_userinfo_photourl",		_("%g||\n%g|| %nYou can view attached photo at: %Thttp://vcard.drakor.eu/%1"), 1);
 	format_add("jabber_userinfo_end",		_("%g`+=%G-----"), 1);
 
 	format_add("jabber_userinfo_error",		_("%! (%1) Error in getting %gvCard%n from %W%2%n: %r%3"), 1);

Modified: trunk/plugins/jabber/jabber_handlers_iq_result.c
===================================================================
--- trunk/plugins/jabber/jabber_handlers_iq_result.c	2008-03-08 23:30:43 UTC (rev 3871)
+++ trunk/plugins/jabber/jabber_handlers_iq_result.c	2008-03-09 00:31:52 UTC (rev 3872)
@@ -726,6 +726,7 @@
 
 JABBER_HANDLER_RESULT(jabber_handle_vcard) {
 	char *from_str = jabber_unescape(from);
+	int hadphoto = 0;
 
 	print("jabber_userinfo_response2", session_name(s), jabberfix(from_str, _("unknown")));
 
@@ -736,7 +737,7 @@
 		else if (!xstrcmp(n->name, "URL"))	jabber_handle_vcard_helper(s, "jabber_userinfo_url", n->data);
 		else if (!xstrcmp(n->name, "DESC"))	jabber_handle_vcard_helper(s, "jabber_userinfo_desc", n->data);
 		else if (!xstrcmp(n->name, "TITLE"))	jabber_handle_vcard_helper(s, "jabber_userinfo_title", n->data);
-		else if (!xstrcmp(n->name, "PHOTO"))	debug("jabber_handle_vcard() PHOTO skipping...\n");		/* skipping */
+		else if (!xstrcmp(n->name, "PHOTO"))	hadphoto = 1;		/* skipping */
 
 		else if (!xstrcmp(n->name, "EMAIL")) {
 			const char *userid = NULL;
@@ -812,6 +813,8 @@
 
 	}
 
+	if (hadphoto && from_str)
+		print("jabber_userinfo_photourl", from_str);
 	print("jabber_userinfo_end", session_name(s), jabberfix(from_str, _("unknown")));
 }