changeset 15119:acf1b5803346

[gaim-migrate @ 17905] I think gdk pixbuf recognizes "jpeg" and not "jpg" Also, is there any reason that Gaim didn't think that gif and jpeg were valid for msn and yahoo? It seems like that would cause us to convert people's icons to pngs, with possible negative consequences committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 07 Dec 2006 03:37:13 +0000
parents 4bf1777efb1f
children e95dfced3030
files libgaim/protocols/jabber/jabber.c libgaim/protocols/msn/msn.c libgaim/protocols/yahoo/yahoo.c
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/protocols/jabber/jabber.c	Thu Dec 07 02:48:08 2006 +0000
+++ b/libgaim/protocols/jabber/jabber.c	Thu Dec 07 03:37:13 2006 +0000
@@ -1844,7 +1844,7 @@
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME,
 	NULL,							/* user_splits */
 	NULL,							/* protocol_options */
-	{"png,jpg,gif", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */
+	{"png,gif,jpeg", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */
 	jabber_list_icon,				/* list_icon */
 	jabber_list_emblems,			/* list_emblems */
 	jabber_status_text,				/* status_text */
--- a/libgaim/protocols/msn/msn.c	Thu Dec 07 02:48:08 2006 +0000
+++ b/libgaim/protocols/msn/msn.c	Thu Dec 07 03:37:13 2006 +0000
@@ -1955,7 +1955,7 @@
 	OPT_PROTO_MAIL_CHECK,
 	NULL,					/* user_splits */
 	NULL,					/* protocol_options */
-	{"png", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND},	/* icon_spec */
+	{"png,gif,jpeg", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND},	/* icon_spec */
 	msn_list_icon,			/* list_icon */
 	msn_list_emblems,		/* list_emblems */
 	msn_status_text,		/* status_text */
--- a/libgaim/protocols/yahoo/yahoo.c	Thu Dec 07 02:48:08 2006 +0000
+++ b/libgaim/protocols/yahoo/yahoo.c	Thu Dec 07 03:37:13 2006 +0000
@@ -3821,7 +3821,7 @@
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_CHAT_TOPIC,
 	NULL, /* user_splits */
 	NULL, /* protocol_options */
-	{"png", 96, 96, 96, 96, GAIM_ICON_SCALE_SEND},
+	{"png,gif,jpeg", 96, 96, 96, 96, GAIM_ICON_SCALE_SEND},
 	yahoo_list_icon,
 	yahoo_list_emblems,
 	yahoo_status_text,