soc.2008.themes: b49d95f4: Changed PurpleTheme build function to on...

ffdragon at soc.pidgin.im ffdragon at soc.pidgin.im
Sat Aug 9 23:30:44 EDT 2008


-----------------------------------------------------------------
Revision: b49d95f44169eb347061907f1842d56d9c3c826c
Ancestor: 9ff1c99844d815e89ceeb09b3b506fef23ada867
Author: ffdragon at soc.pidgin.im
Date: 2008-08-10T03:27:12
Branch: im.pidgin.soc.2008.themes
URL: http://d.pidgin.im/viewmtn/revision/info/b49d95f44169eb347061907f1842d56d9c3c826c

Modified files:
        libpurple/sound-loader.c libpurple/theme-loader.c
        libpurple/theme-loader.h pidgin/gtkblist-loader.c
        pidgin/gtkicon-loader.c

ChangeLog: 

Changed PurpleTheme build function to only return PurpleTheme*

-------------- next part --------------
============================================================
--- libpurple/sound-loader.c	028d810cf20c1e1877873f0677dca7f5693aacc2
+++ libpurple/sound-loader.c	d828d70c595f59102d0db384dd635970d634f26d
@@ -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 @@ purple_sound_loader_build(const gchar *d
 	g_dir_close(gdir);
 	g_free(filename_full);
 	g_free(data);
-	return theme;
+	return PURPLE_THEME(theme);
 }
 
 /******************************************************************************
============================================================
--- libpurple/theme-loader.c	7689fe1bae2ae95d315839167b54b8a4607051e4
+++ libpurple/theme-loader.c	99341dbdac18cdf837335477ff8d27a94feece7b
@@ -179,7 +179,7 @@ purple_theme_loader_set_type_string(Purp
 	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);
============================================================
--- libpurple/theme-loader.h	989050d9fd73da1b110407d5db45ac8fa2c542ce
+++ libpurple/theme-loader.h	4786347c10bbf69fdbe4783ab3898b37215e68bb
@@ -56,7 +56,7 @@ struct _PurpleThemeLoaderClass
 struct _PurpleThemeLoaderClass
 {
 	GObjectClass parent_class;
-	gpointer (*purple_theme_loader_build)(const gchar*);
+	PurpleTheme *((*purple_theme_loader_build)(const gchar*));
 };
 
 /**************************************************************************/
@@ -86,7 +86,7 @@ const gchar *purple_theme_loader_get_typ
  *
  * @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_ */
============================================================
--- pidgin/gtkblist-loader.c	6bf39097d7841d6e26fdd32374c74cbfdaec9f9f
+++ pidgin/gtkblist-loader.c	592dfecb2afe1b76a0019d8dace07c9fdbe1b8d3
@@ -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 @@ pidgin_blist_loader_build(const gchar *d
 	g_dir_close(gdir);
 	g_free(filename_full);
 	g_free(data);
-	return theme;
+	return PURPLE_THEME(theme);
 }
 
 /******************************************************************************
============================================================
--- pidgin/gtkicon-loader.c	467d4e308410152e74438f2f8e5904303f894c86
+++ pidgin/gtkicon-loader.c	8a13620254b05de91a4314531e17793fa1154c8f
@@ -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 @@ pidgin_icon_loader_build(const gchar *di
 	g_dir_close(gdir);
 	g_free(filename_full);
 	g_free(data);
-	return theme;
+	return PURPLE_THEME(theme);
 }
 
 /******************************************************************************


More information about the Commits mailing list