comparison libpurple/theme-manager.c @ 25096:fbf72bbd1084

Fixed up a few typos, readability, leaks, and bugs, all minor and mostly in theme and theme loader classes
author Justin Rodriguez <ffdragon@soc.pidgin.im>
date Mon, 30 Jun 2008 03:50:35 +0000
parents c32dd71d0658
children 331a7a69d955
comparison
equal deleted inserted replaced
25095:ef66901f74f5 25096:fbf72bbd1084
74 static gboolean 74 static gboolean
75 purple_theme_manager_is_theme_type(gchar *key, 75 purple_theme_manager_is_theme_type(gchar *key,
76 gpointer value, 76 gpointer value,
77 gchar *user_data) 77 gchar *user_data)
78 { 78 {
79 return g_str_has_prefix (key, g_strconcat(user_data, "/", NULL)); 79 return g_str_has_prefix(key, g_strconcat(user_data, "/", NULL));
80 } 80 }
81 81
82 static gboolean 82 static gboolean
83 purple_theme_manager_is_theme(gchar *key, 83 purple_theme_manager_is_theme(gchar *key,
84 gpointer value, 84 gpointer value,
221 221
222 PurpleTheme * 222 PurpleTheme *
223 purple_theme_manager_find_theme(const gchar *name, 223 purple_theme_manager_find_theme(const gchar *name,
224 const gchar *type) 224 const gchar *type)
225 { 225 {
226 g_return_val_if_fail(name, NULL); 226 gchar *key;
227 g_return_val_if_fail(type, NULL); 227 PurpleTheme *theme;
228 228
229 return g_hash_table_lookup(theme_table, 229 key = purple_theme_manager_make_key(name, type);
230 purple_theme_manager_make_key(name, type)); 230
231 g_return_val_if_fail(key, NULL);
232
233 theme = g_hash_table_lookup(theme_table, key);
234
235 g_free(key);
236
237 return theme;
231 } 238 }
232 239
233 240
234 void 241 void
235 purple_theme_manager_add_theme(PurpleTheme *theme) 242 purple_theme_manager_add_theme(PurpleTheme *theme)