# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1181071127 0
# Node ID 85440932397b17b0582728feda73c0627453c05f
# Parent  647bfc2b2a7b91da2c6920280923a097334914ab# Parent  e165d1ba884445723f67ee39685010fb52765e60
merge of '0fb2447e14be4a1e56a03c563e347a49bdc8ba07'
     and 'bdc8bacec7df70bbab04a8ac3795f0a9b06d6f56'

diff -r e165d1ba8844 -r 85440932397b libpurple/util.c
--- a/libpurple/util.c	Tue Jun 05 13:59:55 2007 +0000
+++ b/libpurple/util.c	Tue Jun 05 19:18:47 2007 +0000
@@ -2654,14 +2654,17 @@
 
 	if (len >= 4)
 	{
-		if (!strncmp((char *)data, "BM", 2))
-			return "bmp";
-		else if (!strncmp((char *)data, "GIF8", 4))
+		if (!strncmp((char *)data, "GIF8", 4))
 			return "gif";
-		else if (!strncmp((char *)data, "\xff\xd8\xff\xe0", 4))
+		else if (!strncmp((char *)data, "\xff\xd8\xff", 3)) /* 4th may be e0 through ef */
 			return "jpg";
 		else if (!strncmp((char *)data, "\x89PNG", 4))
 			return "png";
+		else if (!strncmp((char *)data, "MM", 2) ||
+				 !strncmp((char *)data, "II", 2))
+			return "tif";
+		else if (!strncmp((char *)data, "BM", 2))
+			return "bmp";
 	}
 
 	return "icon";
diff -r e165d1ba8844 -r 85440932397b pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Tue Jun 05 13:59:55 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Tue Jun 05 19:18:47 2007 +0000
@@ -1099,7 +1099,7 @@
 	g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(gtk_button_clicked), toolbar->font);
 	gtk_menu_shell_append(GTK_MENU_SHELL(font_menu), button);
 
-	button = gtk_menu_item_new_with_mnemonic(_("_Foreground color"));
+	button = gtk_menu_item_new_with_mnemonic(_("Foreground _color"));
 	g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(gtk_button_clicked), toolbar->fgcolor);
 	gtk_menu_shell_append(GTK_MENU_SHELL(font_menu), button);