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
This commit is contained in:
Dan Winship 2009-01-05 16:57:55 +00:00
parent a836486e24
commit 7943f976d4
5 changed files with 11 additions and 5 deletions

View File

@ -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

View File

@ -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);

View File

@ -314,7 +314,6 @@ g_emblem_from_tokens (gchar **tokens,
GEmblem *emblem;
GIcon *icon;
GEmblemOrigin origin;
char *s;
emblem = NULL;

View File

@ -283,7 +283,6 @@ g_emblemed_icon_from_tokens (gchar **tokens,
GError **error)
{
GEmblemedIcon *emblemed_icon;
char *s;
int n;
emblemed_icon = NULL;

View File

@ -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)