From 7943f976d4077db3f14230c299ce78025f4d9e5a Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 5 Jan 2009 16:57:55 +0000 Subject: [PATCH] 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 --- gio/ChangeLog | 10 ++++++++++ gio/gdesktopappinfo.c | 2 +- gio/gemblem.c | 1 - gio/gemblemedicon.c | 1 - gio/xdgmime/xdgmime.c | 2 -- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index 43ed5e4..5848a7a 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,13 @@ +2009-01-05 Dan Winship + + * 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 Bug 566064 – Add NOATIME flag to query_info_flags diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index b2b61ee..017eda7 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 7ecc6f1..4cd70d3 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 36363f8..0fd221c 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 55018ee..c9bcfba 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) -- 2.7.4