cast a "char **" to "const char **" to avoid a warning.

	* gdesktopappinfo.c (update_mimeapps_list): cast a "char **" to
	"const char **" to avoid a warning.

	* gemblem.c (g_emblem_from_tokens):
	* gemblemedicon.c (g_emblemed_icon_from_tokens):
	* xdgmime/xdgmime.c (xdg_mime_get_icon): remove unused
	variables

svn path=/trunk/; revision=7775

5 files changed, 11 insertions, 5 deletions

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 43ed5e486..5848a7ae1 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-05  Dan Winship  <danw@gnome.org>
+
+	* gdesktopappinfo.c (update_mimeapps_list): cast a "char **" to
+	"const char **" to avoid a warning.
+
+	* gemblem.c (g_emblem_from_tokens):
+	* gemblemedicon.c (g_emblemed_icon_from_tokens):
+	* xdgmime/xdgmime.c (xdg_mime_get_icon): remove unused
+	variables
+
 2009-01-05  Matthias Clasen <mclasen@redhat.com>
 
 	Bug 566064 – Add NOATIME flag to query_info_flags
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index b2b61ee82..017eda7d9 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -1306,7 +1306,7 @@ update_mimeapps_list (const char  *desktop_id,
 	     add the current list of (not yet listed) apps before it. */
 
 	  list[i] = NULL; /* Terminate current list so we can use it */
-	  system_list =  get_all_desktop_entries_for_mime_type (content_type, list);
+	  system_list =  get_all_desktop_entries_for_mime_type (content_type, (const char **)list);
 	  
 	  list = g_renew (char *, list, 1 + length + g_list_length (system_list) + 1);
 	  
diff --git a/gio/gemblem.c b/gio/gemblem.c
index 7ecc6f170..4cd70d33b 100644
--- a/gio/gemblem.c
+++ b/gio/gemblem.c
@@ -314,7 +314,6 @@ g_emblem_from_tokens (gchar  **tokens,
   GEmblem *emblem;
   GIcon *icon;
   GEmblemOrigin origin;
-  char *s;
 
   emblem = NULL;
 
diff --git a/gio/gemblemedicon.c b/gio/gemblemedicon.c
index 36363f800..0fd221c5a 100644
--- a/gio/gemblemedicon.c
+++ b/gio/gemblemedicon.c
@@ -283,7 +283,6 @@ g_emblemed_icon_from_tokens (gchar  **tokens,
                              GError **error)
 {
   GEmblemedIcon *emblemed_icon;
-  char *s;
   int n;
 
   emblemed_icon = NULL;
diff --git a/gio/xdgmime/xdgmime.c b/gio/xdgmime/xdgmime.c
index 55018ee48..c9bcfba66 100644
--- a/gio/xdgmime/xdgmime.c
+++ b/gio/xdgmime/xdgmime.c
@@ -906,8 +906,6 @@ xdg_mime_remove_callback (int callback_id)
 const char *
 xdg_mime_get_icon (const char *mime)
 {
-  const char *icon;
-
   xdg_mime_init ();
   
   if (_caches)