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

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 43ed5e4865218831d8fc910293cfbdd94e47b421..5848a7ae1cd0e7540dd5fe0f47fdbe3a26fe9535 100644 (file)
--- 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 b2b61ee82802318b078e2294210a60f2402631d3..017eda7d9aa23299d2aa08a54e7812bcaa011392 100644 (file)
--- 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 7ecc6f170d64e02105974fae1b2171f33a926120..4cd70d33be96cb452e04ba3b07f7d3eb7ee4bad3 100644 (file)
--- 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 36363f8001332f81042c1feeb3fb257630310e2a..0fd221c5aaf7c902d7aeb04b4797ef7483af5c76 100644 (file)
--- 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 55018ee48c28d72fc008b5d2be7b5d4908113ca5..c9bcfba66404ad19dbc556e5bfc814cad80fd0c5 100644 (file)
--- 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)