Silence some gcc compiler warnings

None of these are actual problems, but it's good to keep the
compiler output quiet.

2 files changed, 10 insertions, 9 deletions

diff --git a/gconf/gconf-client.c b/gconf/gconf-client.c
index 98f2051b..1fad73ee 100644
--- a/gconf/gconf-client.c
+++ b/gconf/gconf-client.c
@@ -1090,18 +1090,19 @@ gconf_client_all_entries    (GConfClient* client,
   if (g_hash_table_lookup (client->cache_dirs, dir))
     {
       GHashTableIter iter;
-      gchar *key;
-      GConfEntry *entry;
+      gpointer key, value;
 
       trace ("CACHED: Getting all values in '%s'", dir);
 
       dirlen = strlen (dir);
       retval = NULL;
       g_hash_table_iter_init (&iter, client->cache_hash);
-      while (g_hash_table_iter_next (&iter, &key, &entry))
+      while (g_hash_table_iter_next (&iter, &key, &value))
         {
-          if (g_str_has_prefix (key, dir) &&
-              key + dirlen == strrchr (key, '/'))
+          const gchar *id = key;
+          GConfEntry *entry = value;
+          if (g_str_has_prefix (id, dir) &&
+              id + dirlen == strrchr (id, '/'))
             retval = g_slist_prepend (retval, gconf_entry_copy (entry));
         }
 
diff --git a/gconf/gconf-locale.c b/gconf/gconf-locale.c
index e41fec65..b01ae4cc 100644
--- a/gconf/gconf-locale.c
+++ b/gconf/gconf-locale.c
@@ -273,10 +273,10 @@ compute_locale_variants (const gchar *locale)
 {
   GSList *retval = NULL;
 
-  gchar *language;
-  gchar *territory;
-  gchar *codeset;
-  gchar *modifier;
+  gchar *language = NULL;
+  gchar *territory = NULL;
+  gchar *codeset = NULL;
+  gchar *modifier = NULL;
 
   guint mask;
   guint i;