# HG changeset patch # User Justin Rodriguez # Date 1218338832 0 # Node ID b37ccfd1697be17f00694e013c78fc662421fe7b # Parent 2d436084d866888150288df8fd0f5001382393ec Changed PurpleTheme build function to only return PurpleTheme* diff -r 2d436084d866 -r b37ccfd1697b libpurple/sound-loader.c --- a/libpurple/sound-loader.c Sun Aug 10 02:36:00 2008 +0000 +++ b/libpurple/sound-loader.c Sun Aug 10 03:27:12 2008 +0000 @@ -33,7 +33,7 @@ * Sound Theme Builder *****************************************************************************/ -static gpointer +static PurpleTheme * purple_sound_loader_build(const gchar *dir) { xmlnode *root_node, *sub_node; @@ -83,7 +83,7 @@ g_dir_close(gdir); g_free(filename_full); g_free(data); - return theme; + return PURPLE_THEME(theme); } /****************************************************************************** diff -r 2d436084d866 -r b37ccfd1697b libpurple/theme-loader.c --- a/libpurple/theme-loader.c Sun Aug 10 02:36:00 2008 +0000 +++ b/libpurple/theme-loader.c Sun Aug 10 03:27:12 2008 +0000 @@ -179,7 +179,7 @@ priv->type = g_strdup(type); } -gpointer +PurpleTheme * purple_theme_loader_build(PurpleThemeLoader *loader, const gchar *dir) { return PURPLE_THEME_LOADER_GET_CLASS(loader)->purple_theme_loader_build(dir); diff -r 2d436084d866 -r b37ccfd1697b libpurple/theme-loader.h --- a/libpurple/theme-loader.h Sun Aug 10 02:36:00 2008 +0000 +++ b/libpurple/theme-loader.h Sun Aug 10 03:27:12 2008 +0000 @@ -56,7 +56,7 @@ struct _PurpleThemeLoaderClass { GObjectClass parent_class; - gpointer (*purple_theme_loader_build)(const gchar*); + PurpleTheme *((*purple_theme_loader_build)(const gchar*)); }; /**************************************************************************/ @@ -86,7 +86,7 @@ * * @returns PurpleTheme containing the information from the directory */ -gpointer purple_theme_loader_build(PurpleThemeLoader *loader, const gchar *dir); +PurpleTheme *purple_theme_loader_build(PurpleThemeLoader *loader, const gchar *dir); G_END_DECLS #endif /* _PURPLE_THEME_LOADER_H_ */ diff -r 2d436084d866 -r b37ccfd1697b pidgin/gtkblist-loader.c --- a/pidgin/gtkblist-loader.c Sun Aug 10 02:36:00 2008 +0000 +++ b/pidgin/gtkblist-loader.c Sun Aug 10 03:27:12 2008 +0000 @@ -36,7 +36,7 @@ * Buddy List Theme Builder *****************************************************************************/ -static gpointer +static PurpleTheme * pidgin_blist_loader_build(const gchar *dir) { xmlnode *root_node, *sub_node, *sub_sub_node; @@ -248,7 +248,7 @@ g_dir_close(gdir); g_free(filename_full); g_free(data); - return theme; + return PURPLE_THEME(theme); } /****************************************************************************** diff -r 2d436084d866 -r b37ccfd1697b pidgin/gtkicon-loader.c --- a/pidgin/gtkicon-loader.c Sun Aug 10 02:36:00 2008 +0000 +++ b/pidgin/gtkicon-loader.c Sun Aug 10 03:27:12 2008 +0000 @@ -34,7 +34,7 @@ * Sound Theme Builder *****************************************************************************/ -static gpointer +static PurpleTheme * pidgin_icon_loader_build(const gchar *dir) { xmlnode *root_node, *sub_node; @@ -84,7 +84,7 @@ g_dir_close(gdir); g_free(filename_full); g_free(data); - return theme; + return PURPLE_THEME(theme); } /******************************************************************************