glib r7550 - trunk/gio

[danw svn gnome org]

Author: danw
Date: Fri Sep 26 16:00:17 2008
New Revision: 7550
URL: http://svn.gnome.org/viewvc/glib?rev=7550&view=rev

Log:
	* 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


Modified:
   trunk/gio/ChangeLog
   trunk/gio/gdesktopappinfo.c
   trunk/gio/gfile.c

Modified: trunk/gio/gdesktopappinfo.c
==============================================================================
--- trunk/gio/gdesktopappinfo.c	(original)
+++ trunk/gio/gdesktopappinfo.c	Fri Sep 26 16:00:17 2008
@@ -2475,7 +2475,7 @@
       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);
   

Modified: trunk/gio/gfile.c
==============================================================================
--- trunk/gio/gfile.c	(original)
+++ trunk/gio/gfile.c	Fri Sep 26 16:00:17 2008
@@ -2151,7 +2151,7 @@
 
   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);