# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1190192152 0
# Node ID 301c89809b9acb51021ebcca6220341c5df475cb
# Parent  4a8407152e9a9fc841add0cb4f67785c6f15000f# Parent  d91df8046ec65e46031fc3bfcfce1ce16c97e9b3
merge of '0799159d49f773b16e3a2354b36ef4e5be854595'
     and 'f07a68d96d4f38abf44c83746c89d9f0e134c535'

diff -r d91df8046ec6 -r 301c89809b9a libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Wed Sep 19 08:53:00 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Wed Sep 19 08:55:52 2007 +0000
@@ -1573,8 +1573,7 @@
 msn_info_strip_search_link(const char *field, size_t len)
 {
 	const char *c;
-	if ((c = strstr(field, " (http://spaces.live.com/default.aspx?page=searchresults")) == NULL &&
-		(c = strstr(field, " (http://spaces.msn.com/default.aspx?page=searchresults")) == NULL)
+	if ((c = strstr(field, " (http://")) == NULL))
 		return g_strndup(field, len);
 	return g_strndup(field, c - field);
 }
diff -r d91df8046ec6 -r 301c89809b9a pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Wed Sep 19 08:53:00 2007 +0000
+++ b/pidgin/gtkblist.c	Wed Sep 19 08:55:52 2007 +0000
@@ -5816,7 +5816,7 @@
 	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
 
 	/* Set up stuff for the account box */
-	label = gtk_label_new_with_mnemonic(_("_Account:"));
+	label = gtk_label_new_with_mnemonic(_("A_ccount:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
 
diff -r d91df8046ec6 -r 301c89809b9a pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed Sep 19 08:53:00 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Sep 19 08:55:52 2007 +0000
@@ -3634,7 +3634,7 @@
 		gtk_widget_destroy(win->menu.send_to);
 
 	/* Build the Send To menu */
-	win->menu.send_to = gtk_menu_item_new_with_mnemonic(_("_Send To"));
+	win->menu.send_to = gtk_menu_item_new_with_mnemonic(_("S_end To"));
 	gtk_widget_show(win->menu.send_to);
 
 	menu = gtk_menu_new();
@@ -8083,7 +8083,7 @@
 		sub = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtkconv->win->menu.send_to));
 
 		if (sub && GTK_WIDGET_IS_SENSITIVE(gtkconv->win->menu.send_to)) {
-			GtkWidget *item = gtk_menu_item_new_with_mnemonic(_("_Send To"));
+			GtkWidget *item = gtk_menu_item_new_with_mnemonic(_("S_end To"));
 			if (populated)
 				pidgin_separator(menu);
 			gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);