Mercurial > pidgin.yaz
changeset 12915:fe2cb084ab16
[gaim-migrate @ 15268]
SF Patch #1405994 from Sadrul
"This patch allows themes to define smileys with spaces
in them, escaped by a \. It seems to be working for me."
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 17 Jan 2006 16:59:51 +0000 |
| parents | 4f4c377a8905 |
| children | 8401da9b976f |
| files | pixmaps/smileys/default/theme plugins/ChangeLog.API src/gtkthemes.c |
| diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pixmaps/smileys/default/theme Tue Jan 17 16:13:24 2006 +0000 +++ b/pixmaps/smileys/default/theme Tue Jan 17 16:59:51 2006 +0000 @@ -24,7 +24,7 @@ burp.png :-! embarrassed.png :-[ cry.png :'( -think.png :-/ :-\ +think.png :-/ :-\\ crossedlips.png :-X bigsmile.png :-D :-d angel.png O:-) @@ -132,7 +132,7 @@ yahoo_mean.gif :> :-> yahoo_neutral.gif :| :-| yahoo_ooooh.gif :O :-O :o :-o -yahoo_question.gif :-\ :-/ +yahoo_question.gif :-\\ :-/ yahoo_sad.gif :( :-( yahoo_shhhh.gif :-$ yahoo_sick.gif :-& @@ -155,7 +155,7 @@ yahoo_coffee.gif ~o) ~O) yahoo_cow.gif 3:-0 3:-O 3:-o yahoo_cowboy.gif <):) -yahoo_dance.gif \:D/ \:d/ +yahoo_dance.gif \\:D/ \\:d/ yahoo_flower.gif @};- yahoo_frustrated.gif :-L :-l yahoo_ghost.gif 8-X 8-x
--- a/plugins/ChangeLog.API Tue Jan 17 16:13:24 2006 +0000 +++ b/plugins/ChangeLog.API Tue Jan 17 16:59:51 2006 +0000 @@ -92,6 +92,7 @@ * gtk_imhtml_get_current_format(): the arguments are now set to TRUE or FALSE. Previously they were set to TRUE or left alone. Also, you may now pass NULL if you're not interested in a specific formatting. + * Smiley Themes: Backslashes must be backslash-escaped. Removed: * gaim_gtk_sound_{get,set}_mute() (replaced by the /gaim/gtk/sound/mute
--- a/src/gtkthemes.c Tue Jan 17 16:13:24 2006 +0000 +++ b/src/gtkthemes.c Tue Jan 17 16:59:51 2006 +0000 @@ -172,8 +172,11 @@ while (*i) { char l[64]; int li = 0; - while (!isspace(*i)) + while (!isspace(*i)) { + if (*i == '\\' && *(i+1) != '\0' ) + i++; l[li++] = *(i++); + } if (!sfile) { l[li] = 0; sfile = g_build_filename(dirname, l, NULL);