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

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 565e47f..29a9558 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -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

diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index 0bab123..b86e420 100644 (file)
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -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);
   

diff --git a/gio/gfile.c b/gio/gfile.c
index e89701f..bb7f6e1 100644 (file)
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -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);