Mercurial > pidgin
changeset 17499:85440932397b
merge of '0fb2447e14be4a1e56a03c563e347a49bdc8ba07'
and 'bdc8bacec7df70bbab04a8ac3795f0a9b06d6f56'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 05 Jun 2007 19:18:47 +0000 |
| parents | 647bfc2b2a7b (diff) e165d1ba8844 (current diff) |
| children | bca2780f7669 |
| files | libpurple/protocols/bonjour/dns_sd.c libpurple/protocols/bonjour/dns_sd.h |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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";
--- 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);