soc.2008.themes: 5d9f09ec: Fixed some warnings with loader_build

[ffdragon at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 5d9f09ec4361138eeabe95a926a0b16bf2fb9adb
Ancestor: c7606bfdc46d02cea069f8818e3f6d5fb77173e5
Author: ffdragon at soc.pidgin.im
Date: 2008-06-17T03:26:00
Branch: im.pidgin.soc.2008.themes
URL: http://d.pidgin.im/viewmtn/revision/info/5d9f09ec4361138eeabe95a926a0b16bf2fb9adb

Modified files:
        libpurple/sound-loader.c libpurple/theme-loader.c
        libpurple/theme-loader.h libpurple/theme-manager.c

ChangeLog: 

Fixed some warnings with loader_build

-------------- next part --------------
============================================================
--- libpurple/sound-loader.c	77164ecb5ed5729c14f4ef8f68b8496ea662a0f6
+++ libpurple/sound-loader.c	746a88c2500eb0f406b936d28c56caabeff5ccda
@@ -43,7 +43,7 @@ static PurpleThemeLoaderClass *parent_cl
 #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 @@ purple_sound_theme_loader_class_init (Pu
 {
 	parent_class = g_type_class_peek_parent (klass);
 	
-	/* TODO: fix warning */
 	parent_class->purple_theme_loader_build = purple_sound_loader_build;
 }
 
============================================================
--- libpurple/theme-loader.c	8621db57b1e87458ca01a6d354acc40a1f2c0301
+++ libpurple/theme-loader.c	22cf2051719b704078e840e0e0b5c76642036479
@@ -172,9 +172,8 @@ purple_theme_loader_set_type_string(Purp
 	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);
 }
============================================================
--- libpurple/theme-loader.h	ac79cc3c2466a8aeae322766a53980ee7f342b95
+++ libpurple/theme-loader.h	4e9302ece03c69349a5fc7fe1cf8fa95a8431a37
@@ -56,7 +56,7 @@ struct _PurpleThemeLoaderClass
 struct _PurpleThemeLoaderClass
 {
 	GObjectClass parent_class;
-	PurpleTheme *(*purple_theme_loader_build)(const gchar);
+	gpointer (*purple_theme_loader_build)(const gchar*);
 };
 
 /**************************************************************************/
@@ -86,7 +86,7 @@ gchar *purple_theme_loader_get_type_stri
  *
  * @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_ */
============================================================
--- libpurple/theme-manager.c	55e9d6811c6031315cc94536cee6e0c6ee95044e
+++ libpurple/theme-manager.c	5e43d00214b233fa5f7f3cdf1f073b459afec280
@@ -119,7 +119,7 @@ purple_theme_manager_build_dir(const gch
 			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));
 
 				}