[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.603,1.604

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24427/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
A patch from Tom Samstag to show "Info for somebody" in
the buddy info results for AIM and ICQ.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.603
retrieving revision 1.604
diff -u -d -p -r1.603 -r1.604
--- oscar.c	30 May 2004 17:05:21 -0000	1.603
+++ oscar.c	9 Jun 2004 03:40:33 -0000	1.604
@@ -3792,18 +3792,21 @@ static int gaim_parse_clientauto_ch4(aim
 
 	switch(reason) {
 		case 0x0003: { /* Reply from an ICQ status message request */
-			char *status_msg = oscar_icqstatus(state);
-			char *dialog_msg, **splitmsg;
+			char *title, *statusmsg, **splitmsg, *dialogmsg;
+
+			title = g_strdup_printf(_("Info for %s"), who);
 
 			/* Split at (carriage return/newline)'s, then rejoin later with BRs between. */
+			statusmsg = oscar_icqstatus(state);
 			splitmsg = g_strsplit(msg, "\r\n", 0);
+			dialogmsg = g_strdup_printf(_("<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"), who, statusmsg, g_strjoinv("<BR>", splitmsg));
+			g_free(statusmsg);
+			g_strfreev(splitmsg);
 
-			dialog_msg = g_strdup_printf(_("<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"), who, status_msg, g_strjoinv("<BR>", splitmsg));
-			gaim_notify_formatted(gc, NULL, _("Buddy Information"), NULL, dialog_msg, NULL, NULL);
+			gaim_notify_formatted(gc, title, _("Buddy Information"), NULL, dialogmsg, NULL, NULL);
 
-			g_free(status_msg);
-			g_free(dialog_msg);
-			g_strfreev(splitmsg);
+			g_free(title);
+			g_free(dialogmsg);
 		} break;
 
 		default: {
@@ -3965,7 +3968,7 @@ static int gaim_parse_userinfo(aim_sessi
 	GaimConnection *gc = sess->aux_data;
 	GaimAccount *account = gaim_connection_get_account(gc);
 	GString *str;
-	gchar *tmp = NULL, *info_utf8 = NULL, *away_utf8 = NULL;
+	gchar *tmp = NULL, *info_utf8 = NULL, *away_utf8 = NULL, *title = NULL;
 	va_list ap;
 	aim_userinfo_t *userinfo;
 
@@ -4015,7 +4018,9 @@ static int gaim_parse_userinfo(aim_sessi
 
 	tmp = gaim_str_sub_away_formatters(str->str, gaim_account_get_username(account));
 	g_string_free(str, TRUE);
-	gaim_notify_formatted(gc, NULL, _("Buddy Information"), NULL, tmp, NULL, NULL);
+	title = g_strdup_printf(_("Info for %s"), userinfo->sn);
+	gaim_notify_formatted(gc, title, _("Buddy Information"), NULL, tmp, NULL, NULL);
+	g_free(title);
 	g_free(tmp);
 
 	return 1;