diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-22 00:24:14 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-22 17:43:50 +0800 |
| commit | c77666dd4ec3151b2a3f2fdb1d6b75253bf09f43 (patch) | |
| tree | 4851e766b97cb1b080f07673db64ef7a44459fba | |
| parent | 05f02c1a884c7a6fd31cff468534a55f9bc248b2 (diff) | |
| download | gsoc2013-empathy-c77666dd4ec3151b2a3f2fdb1d6b75253bf09f43.tar gsoc2013-empathy-c77666dd4ec3151b2a3f2fdb1d6b75253bf09f43.tar.gz gsoc2013-empathy-c77666dd4ec3151b2a3f2fdb1d6b75253bf09f43.tar.bz2 gsoc2013-empathy-c77666dd4ec3151b2a3f2fdb1d6b75253bf09f43.tar.lz gsoc2013-empathy-c77666dd4ec3151b2a3f2fdb1d6b75253bf09f43.tar.xz gsoc2013-empathy-c77666dd4ec3151b2a3f2fdb1d6b75253bf09f43.tar.zst gsoc2013-empathy-c77666dd4ec3151b2a3f2fdb1d6b75253bf09f43.zip | |
empathy-theme-manager.c: fix shadow declarations
| -rw-r--r-- | libempathy-gtk/empathy-theme-manager.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c index fea2eca51..cda978330 100644 --- a/libempathy-gtk/empathy-theme-manager.c +++ b/libempathy-gtk/empathy-theme-manager.c @@ -573,24 +573,24 @@ GList * empathy_theme_manager_get_adium_themes (void) { #ifdef HAVE_WEBKIT - GList *themes = NULL; + GList *themes_list = NULL; gchar *userpath = NULL; const gchar *const *paths = NULL; gint i = 0; userpath = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), "adium/message-styles", NULL); - find_themes (&themes, userpath); + find_themes (&themes_list, userpath); g_free (userpath); paths = g_get_system_data_dirs (); for (i = 0; paths[i] != NULL; i++) { userpath = g_build_path (G_DIR_SEPARATOR_S, paths[i], "adium/message-styles", NULL); - find_themes (&themes, userpath); + find_themes (&themes_list, userpath); g_free (userpath); } - return themes; + return themes_list; #else return NULL; #endif /* HAVE_WEBKIT */ |