changeset 17577:60bc2827d0e7

merge of '0e092e2c969ff59e242f866fd69d643b77bad18c' and '49fd2d3743c303820668e5566f9513c3a16bca71'
author Mark Doliner <mark@kingant.net>
date Sun, 10 Jun 2007 15:59:10 +0000
parents 04f1a6da47a2 (diff) d495103dcf88 (current diff)
children 2c425e60fb1d 210fc36306e4
files
diffstat 2 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Sun Jun 10 15:58:23 2007 +0000
+++ b/pidgin/gtkblist.c	Sun Jun 10 15:59:10 2007 +0000
@@ -1167,7 +1167,7 @@
 			return FALSE;
 		}
 		if(buddy)
-			serv_get_info(buddy->account->gc, buddy->name);
+			gtk_blist_menu_info_cb(NULL, buddy);
 	} else if (event->keyval == GDK_F2) {
 		gtk_blist_menu_alias_cb(tv, node);
 	}
@@ -1421,7 +1421,7 @@
 			prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
 
 		if (prpl && prpl_info->get_info)
-			serv_get_info(b->account->gc, b->name);
+			gtk_blist_menu_info_cb(NULL, b);
 		handled = TRUE;
 	}
 
--- a/pidgin/gtkdialogs.c	Sun Jun 10 15:58:23 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sun Jun 10 15:59:10 2007 +0000
@@ -822,8 +822,17 @@
 	if (username != NULL && purple_str_has_suffix(username, "rocksmyworld"))
 		found = pidgin_dialogs_ee(username);
 
-	if (!found && username != NULL && *username != '\0' && account != NULL)
-		serv_get_info(purple_account_get_connection(account), username);
+	if (!found && username != NULL && *username != '\0' && account != NULL) {
+
+		PurpleConnection *gc = purple_account_get_connection(account);
+
+		PurpleNotifyUserInfo *info = purple_notify_user_info_new();
+		purple_notify_user_info_add_pair(info, _("Information"), _("Retrieving..."));
+		purple_notify_userinfo(gc, username, info, NULL, NULL);
+		purple_notify_user_info_destroy(info);
+
+		serv_get_info(gc, username);
+	}
 
 	g_free(username);
 }