Mercurial > pidgin3 / file diff

--- 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);