Mercurial > pidgin.yaz
diff pidgin/gtkthemes.h @ 20407:1122d47583a1
explicit merge of 'd42ad2da81f881b2fbd2fb080cc70a843bc70d02'
and '8582c561c020d2d1e8d358e2e7cd9e3da113ed9e'
to branch 'im.pidgin.cpw.khc.msnp14'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Wed, 02 May 2007 05:25:27 +0000 |
parents | 0973688f4b74 |
children | cf6b7aeae062 |
line wrap: on
line diff
--- a/pidgin/gtkthemes.h Sun Apr 15 20:12:06 2007 +0000 +++ b/pidgin/gtkthemes.h Wed May 02 05:25:27 2007 +0000 @@ -1,6 +1,6 @@ /** * @file gtkthemes.h GTK+ Smiley Theme API - * @ingroup gtkui + * @ingroup pidgin * * pidgin * @@ -44,10 +44,10 @@ extern struct smiley_theme *current_smiley_theme; extern GSList *smiley_themes; -void pidginthemes_init(void); -gboolean pidginthemes_smileys_disabled(void); -void pidginthemes_smiley_themeize(GtkWidget *); -void pidginthemes_smiley_theme_probe(void); -void pidginthemes_load_smiley_theme(const char *file, gboolean load); -GSList *pidginthemes_get_proto_smileys(const char *id); +void pidgin_themes_init(void); +gboolean pidgin_themes_smileys_disabled(void); +void pidgin_themes_smiley_themeize(GtkWidget *); +void pidgin_themes_smiley_theme_probe(void); +void pidgin_themes_load_smiley_theme(const char *file, gboolean load); +GSList *pidgin_themes_get_proto_smileys(const char *id); #endif /* _PIDGINDIALOGS_H_ */