Mercurial > pidgin.yaz

changeset 23701:b37ccfd1697b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed PurpleTheme build function to only return PurpleTheme*
author Justin Rodriguez <ffdragon@soc.pidgin.im>
date Sun, 10 Aug 2008 03:27:12 +0000
parents 2d436084d866
children 9525fb966efb 78b43f9c741b
files libpurple/sound-loader.c libpurple/theme-loader.c libpurple/theme-loader.h pidgin/gtkblist-loader.c pidgin/gtkicon-loader.c
diffstat 5 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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);
 }
 
 /******************************************************************************
--- 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);
--- 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_ */
--- 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);
 }
 
 /******************************************************************************
--- 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);
 }
 
 /******************************************************************************