# HG changeset patch
# User Justin Rodriguez <ffdragon@soc.pidgin.im>
# Date 1214091777 0
# Node ID d60c3d1c6966ff84e5491e36e048f6a2b9256d8e
# Parent  9ffbfbcf307d7ddc8468eed85f3ac15bf8732def
fixed some gobject stuff

diff -r 9ffbfbcf307d -r d60c3d1c6966 libpurple/sound-loader.c
--- a/libpurple/sound-loader.c	Sat Jun 21 05:55:58 2008 +0000
+++ b/libpurple/sound-loader.c	Sat Jun 21 23:42:57 2008 +0000
@@ -70,14 +70,14 @@
 	/* Parse the tree */
 	theme = g_object_new(PURPLE_TYPE_SOUND_THEME, "type", "sound", NULL);
 		
-	purple_theme_set_name(theme->parent, xmlnode_get_attrib(root_node, THEME_NAME));
-	purple_theme_set_author(theme->parent, xmlnode_get_attrib(root_node, THEME_AUTHOR));
+	purple_theme_set_name(PURPLE_THEME(theme), xmlnode_get_attrib(root_node, THEME_NAME));
+	purple_theme_set_author(PURPLE_THEME(theme), xmlnode_get_attrib(root_node, THEME_AUTHOR));
 
 	image = g_build_filename(dir, xmlnode_get_attrib(root_node, THEME_IMAGE), NULL);
 	
 	sub_node = xmlnode_get_child(root_node, THEME_DESCRIPTION);
 	data = xmlnode_get_data(sub_node);
-	purple_theme_set_description(theme->parent, data);
+	purple_theme_set_description(PURPLE_THEME(theme), data);
 	xmlnode_free(sub_node);
 
 	while ((sub_node = xmlnode_get_child(root_node, THEME_SOUND_EVENT)) != NULL){
@@ -127,7 +127,7 @@
       NULL,   /* value table */
     };
     type = g_type_register_static (G_TYPE_OBJECT,
-                                   "PurpleSoundThemeLoaderType",
+                                   "PurpleSoundThemeLoader",
                                    &info, 0);
   }
   return type;
diff -r 9ffbfbcf307d -r d60c3d1c6966 libpurple/sound-theme.c
--- a/libpurple/sound-theme.c	Sat Jun 21 05:55:58 2008 +0000
+++ b/libpurple/sound-theme.c	Sat Jun 21 23:42:57 2008 +0000
@@ -103,8 +103,8 @@
       purple_sound_theme_init,    /* instance_init */
       NULL,   /* value table */
     };
-    type = g_type_register_static (G_TYPE_OBJECT,
-                                   "PurpleSoundThemeType",
+    type = g_type_register_static (PURPLE_TYPE_THEME,
+                                   "PurpleSoundTheme",
                                    &info, 0);
   }
   return type;
@@ -136,9 +136,9 @@
 
 	g_return_val_if_fail(PURPLE_IS_SOUND_THEME(theme), NULL);
 
-	dir = purple_theme_get_dir(theme->parent);
+	dir = purple_theme_get_dir(PURPLE_THEME(theme));
 	fname = purple_sound_theme_get_file(theme, event);
-	full = g_strconcat (dir, '/',fname, NULL);
+	full = g_build_filename(dir, fname, NULL);
 
 	g_free(dir);
 	g_free(fname);
diff -r 9ffbfbcf307d -r d60c3d1c6966 libpurple/sound-theme.h
--- a/libpurple/sound-theme.h	Sat Jun 21 05:55:58 2008 +0000
+++ b/libpurple/sound-theme.h	Sat Jun 21 23:42:57 2008 +0000
@@ -50,7 +50,7 @@
 
 struct _PurpleSoundTheme
 {
-	PurpleTheme *parent;
+	PurpleTheme parent;
 	gpointer priv;
 };
 
diff -r 9ffbfbcf307d -r d60c3d1c6966 libpurple/theme-loader.c
--- a/libpurple/theme-loader.c	Sat Jun 21 05:55:58 2008 +0000
+++ b/libpurple/theme-loader.c	Sat Jun 21 23:42:57 2008 +0000
@@ -43,7 +43,6 @@
 /******************************************************************************
  * Enums
  *****************************************************************************/
-#define PROP_TYPE_S "type"
 
 enum {
 	PROP_ZERO = 0,
@@ -109,10 +108,10 @@
 	obj_class->finalize = purple_theme_loader_finalize;
 
 	/* TYPE STRING (read only) */
-	pspec = g_param_spec_string(PROP_TYPE_S, "Type",
+	pspec = g_param_spec_string("type", "Type",
 				    "The string represtenting the type of the theme",
 				    NULL,
-				    G_PARAM_READABLE | G_PARAM_CONSTRUCT_ONLY);
+				    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
 	g_object_class_install_property(obj_class, PROP_TYPE, pspec);
 }
 
diff -r 9ffbfbcf307d -r d60c3d1c6966 libpurple/theme-manager.c
--- a/libpurple/theme-manager.c	Sat Jun 21 05:55:58 2008 +0000
+++ b/libpurple/theme-manager.c	Sat Jun 21 23:42:57 2008 +0000
@@ -52,7 +52,7 @@
       NULL,   /* Value Table */
     };
     type = g_type_register_static (G_TYPE_OBJECT,
-                                   "PurpleThemeManagerType",
+                                   "PurpleThemeManager",
                                    &info, 0);
   }
   return type;
diff -r 9ffbfbcf307d -r d60c3d1c6966 libpurple/theme.c
--- a/libpurple/theme.c	Sat Jun 21 05:55:58 2008 +0000
+++ b/libpurple/theme.c	Sat Jun 21 23:42:57 2008 +0000
@@ -194,7 +194,7 @@
 	/* PREVIEW IMAGE */
 	pspec = g_param_spec_pointer(PROP_IMAGE_S, "Image",
 				    "A preview image of the theme",
-				    G_PARAM_READABLE);
+				    G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_IMAGE, pspec);
 }
 
@@ -217,7 +217,7 @@
       NULL,   /* value table */
     };
     type = g_type_register_static (G_TYPE_OBJECT,
-                                   "PurpleThemeType",
+                                   "PurpleTheme",
                                    &info, G_TYPE_FLAG_ABSTRACT);
   }
   return type;