Mercurial > pidgin.yaz
comparison src/gtkmain.c @ 11525:b47708f46a38
[gaim-migrate @ 13773]
Here's the rest of that custom smiley receiving patch, with some changes
from me. I'm still not all that happy with it, but that's probably not
the author's fault, and I don't have time to take it further right now.
committer: Tailor Script <tailor@pidgin.im>
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Mon, 12 Sep 2005 13:25:41 +0000 |
parents | 2fdd2bd7755a |
children | 9b3833da6840 |
comparison
equal
deleted
inserted
replaced
11524:4fd0c3a663b8 | 11525:b47708f46a38 |
---|---|
55 #include "gtkprivacy.h" | 55 #include "gtkprivacy.h" |
56 #include "gtkrequest.h" | 56 #include "gtkrequest.h" |
57 #include "gtkroomlist.h" | 57 #include "gtkroomlist.h" |
58 #include "gtksavedstatuses.h" | 58 #include "gtksavedstatuses.h" |
59 #include "gtksound.h" | 59 #include "gtksound.h" |
60 #include "gtkthemes.h" | |
60 #include "gtkutils.h" | 61 #include "gtkutils.h" |
61 #include "gtkstock.h" | 62 #include "gtkstock.h" |
62 #include "gtkwhiteboard.h" | 63 #include "gtkwhiteboard.h" |
63 | 64 |
64 #if HAVE_SIGNAL_H | 65 #if HAVE_SIGNAL_H |
213 GList *icons = NULL; | 214 GList *icons = NULL; |
214 GdkPixbuf *icon = NULL; | 215 GdkPixbuf *icon = NULL; |
215 char *icon_path; | 216 char *icon_path; |
216 #endif | 217 #endif |
217 | 218 |
218 if (current_smiley_theme == NULL) { | 219 gaim_gtkthemes_init(); |
219 smiley_theme_probe(); | |
220 if (smiley_themes != NULL) { | |
221 struct smiley_theme *smile = smiley_themes->data; | |
222 load_smiley_theme(smile->path, TRUE); | |
223 } | |
224 } | |
225 | 220 |
226 gaim_gtk_blist_setup_sort_methods(); | 221 gaim_gtk_blist_setup_sort_methods(); |
227 | 222 |
228 #ifndef _WIN32 | 223 #ifndef _WIN32 |
229 /* use the nice PNG icon for all the windows */ | 224 /* use the nice PNG icon for all the windows */ |