Mercurial > pidgin

comparison libpurple/sound-theme.c @ 25089:d60c3d1c6966

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed some gobject stuff
author Justin Rodriguez <ffdragon@soc.pidgin.im>
date Sat, 21 Jun 2008 23:42:57 +0000
parents fecc8e2612c4
children 5a02912e0bac
comparison
equal deleted inserted replaced
25088:9ffbfbcf307d 25089:d60c3d1c6966
101 sizeof (PurpleSoundTheme), 101 sizeof (PurpleSoundTheme),
102 0, /* n_preallocs */ 102 0, /* n_preallocs */
103 purple_sound_theme_init, /* instance_init */ 103 purple_sound_theme_init, /* instance_init */
104 NULL, /* value table */ 104 NULL, /* value table */
105 }; 105 };
106 type = g_type_register_static (G_TYPE_OBJECT, 106 type = g_type_register_static (PURPLE_TYPE_THEME,
107 "PurpleSoundThemeType", 107 "PurpleSoundTheme",
108 &info, 0); 108 &info, 0);
109 } 109 }
110 return type; 110 return type;
111 } 111 }
112 112
134 { 134 {
135 gchar *dir, *fname, *full; 135 gchar *dir, *fname, *full;
136 136
137 g_return_val_if_fail(PURPLE_IS_SOUND_THEME(theme), NULL); 137 g_return_val_if_fail(PURPLE_IS_SOUND_THEME(theme), NULL);
138 138
139 dir = purple_theme_get_dir(theme->parent); 139 dir = purple_theme_get_dir(PURPLE_THEME(theme));
140 fname = purple_sound_theme_get_file(theme, event); 140 fname = purple_sound_theme_get_file(theme, event);
141 full = g_strconcat (dir, '/',fname, NULL); 141 full = g_build_filename(dir, fname, NULL);
142 142
143 g_free(dir); 143 g_free(dir);
144 g_free(fname); 144 g_free(fname);
145 145
146 return full; 146 return full;