add a cast to stop a gcc warning

* gdesktopappinfo.c (get_all_desktop_entries_for_mime_type): add a
	cast to stop a gcc warning

	* gfile.c (g_file_copy_attributes): add parens to stop a gcc
	warning

svn path=/trunk/; revision=7550
This commit is contained in:
Dan Winship
2008-09-26 16:00:17 +00:00
parent b60040d9ed
commit 5360907e9e
3 changed files with 10 additions and 2 deletions

View File

@@ -1,3 +1,11 @@
2008-09-26 Dan Winship <danw@gnome.org>
* gdesktopappinfo.c (get_all_desktop_entries_for_mime_type): add a
cast to stop a gcc warning
* gfile.c (g_file_copy_attributes): add parens to stop a gcc
warning
2008-09-25 Dan Winship <danw@gnome.org>
Bug 553426 - cancellable clarifications

View File

@@ -2475,7 +2475,7 @@ get_all_desktop_entries_for_mime_type (const char *base_mime_type)
g_strfreev (anc);
}
g_ptr_array_add (array, NULL);
mime_types = g_ptr_array_free (array, FALSE);
mime_types = (char **)g_ptr_array_free (array, FALSE);
G_LOCK (mime_info_cache);

View File

@@ -2151,7 +2151,7 @@ g_file_copy_attributes (GFile *source,
as_move = flags & G_FILE_COPY_ALL_METADATA;
source_nofollow_symlinks = flags & G_FILE_COPY_NOFOLLOW_SYMLINKS;
skip_perms = flags & G_FILE_COPY_TARGET_DEFAULT_PERMS != 0;
skip_perms = (flags & G_FILE_COPY_TARGET_DEFAULT_PERMS) != 0;
/* Ignore errors here, if the target supports no attributes there is nothing to copy */
attributes = g_file_query_settable_attributes (destination, cancellable, NULL);