# HG changeset patch
# User Justin Rodriguez <ffdragon@soc.pidgin.im>
# Date 1213673160 0
# Node ID 51bdbab30704c7af5188f35b05da8bca4740cfd6
# Parent  774ef2a2e7f8c8865392a98e3dd1635dbaee9f96
Fixed some warnings with loader_build

diff -r 774ef2a2e7f8 -r 51bdbab30704 libpurple/sound-loader.c
--- 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;
 }
 
diff -r 774ef2a2e7f8 -r 51bdbab30704 libpurple/theme-loader.c
--- 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);
 }
diff -r 774ef2a2e7f8 -r 51bdbab30704 libpurple/theme-loader.h
--- 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_ */
diff -r 774ef2a2e7f8 -r 51bdbab30704 libpurple/theme-manager.c
--- 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));
 
 				}