[empathy: 9/26] empathy-theme-manager.c: fix shadow declarations
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy: 9/26] empathy-theme-manager.c: fix shadow declarations
- Date: Thu, 22 Oct 2009 13:38:24 +0000 (UTC)
commit c77666dd4ec3151b2a3f2fdb1d6b75253bf09f43
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Oct 21 17:24:14 2009 +0100
empathy-theme-manager.c: fix shadow declarations
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 fea2eca..cda9783 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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]