Mercurial > pidgin
changeset 25087:51bdbab30704
Fixed some warnings with loader_build
| author | Justin Rodriguez <ffdragon@soc.pidgin.im> |
|---|---|
| date | Tue, 17 Jun 2008 03:26:00 +0000 |
| parents | 774ef2a2e7f8 |
| children | 9ffbfbcf307d |
| files | libpurple/sound-loader.c libpurple/theme-loader.c libpurple/theme-loader.h libpurple/theme-manager.c |
| diffstat | 4 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/sound-loader.c Mon Jun 16 21:43:34 2008 +0000 +++ b/libpurple/sound-loader.c Tue Jun 17 03:26:00 2008 +0000 @@ -43,7 +43,7 @@ #define THEME_EVENT_NAME "name" #define THEME_EVENT_FILE "file" -static PurpleSoundTheme * +static gpointer purple_sound_loader_build(const gchar *dir) { xmlnode *root_node, *sub_node; @@ -104,7 +104,6 @@ { parent_class = g_type_class_peek_parent (klass); - /* TODO: fix warning */ parent_class->purple_theme_loader_build = purple_sound_loader_build; }
--- a/libpurple/theme-loader.c Mon Jun 16 21:43:34 2008 +0000 +++ b/libpurple/theme-loader.c Tue Jun 17 03:26:00 2008 +0000 @@ -172,9 +172,8 @@ priv->type = g_strdup (type); } -PurpleTheme * +gpointer purple_theme_loader_build (PurpleThemeLoader *loader, const gchar *dir) { - /* TODO: fix warning */ return PURPLE_THEME_LOADER_GET_CLASS(loader)->purple_theme_loader_build(dir); }
--- a/libpurple/theme-loader.h Mon Jun 16 21:43:34 2008 +0000 +++ b/libpurple/theme-loader.h Tue Jun 17 03:26:00 2008 +0000 @@ -56,7 +56,7 @@ struct _PurpleThemeLoaderClass { GObjectClass parent_class; - PurpleTheme *(*purple_theme_loader_build)(const gchar); + gpointer (*purple_theme_loader_build)(const gchar*); }; /**************************************************************************/ @@ -86,7 +86,7 @@ * * @returns PurpleTheme containing the information from the directory */ -PurpleTheme *purple_theme_loader_build(PurpleThemeLoader *loader, const gchar *dir); +gpointer purple_theme_loader_build(PurpleThemeLoader *loader, const gchar *dir); G_END_DECLS #endif /* _PURPLE_THEME_LOADER_H_ */
--- a/libpurple/theme-manager.c Mon Jun 16 21:43:34 2008 +0000 +++ b/libpurple/theme-manager.c Tue Jun 17 03:26:00 2008 +0000 @@ -119,7 +119,7 @@ while ((type = g_strdup(g_dir_read_name (dir)))) { if ((loader = g_hash_table_lookup (theme_table, type))){ - theme_dir = g_strconcat(purple_dir, '/', type, NULL); + theme_dir = g_build_filename(purple_dir, type, NULL); purple_theme_manager_add_theme(purple_theme_loader_build(loader, theme_dir)); }