glib r6599 - trunk/gio

[alexl svn gnome org]

Author: alexl
Date: Wed Feb 27 11:23:35 2008
New Revision: 6599
URL: http://svn.gnome.org/viewvc/glib?rev=6599&view=rev

Log:
2008-02-27  Alexander Larsson  <alexl redhat com>

        * gcontenttype.c:
	Fix type warnings
	
        * gunixvolume.c:
        (g_unix_volume_mount):
	Add missing GMountMountFlags argument



Modified:
   trunk/gio/ChangeLog
   trunk/gio/gcontenttype.c
   trunk/gio/gunixvolume.c

Modified: trunk/gio/gcontenttype.c
==============================================================================
--- trunk/gio/gcontenttype.c	(original)
+++ trunk/gio/gcontenttype.c	Wed Feb 27 11:23:35 2008
@@ -644,16 +644,17 @@
 GIcon *
 g_content_type_get_icon (const char *type)
 {
-  char *mimetype_icon, *generic_mimetype_icon, *p;
+  char *mimetype_icon, *generic_mimetype_icon, *q;
   char *icon_names[3];
-  GThemedIcon *themed_icon;
+  const char *p;
+  GIcon *themed_icon;
   
   g_return_val_if_fail (type != NULL, NULL);
   
   mimetype_icon = g_strdup (type);
   
-  while ((p = strchr (mimetype_icon, '/')) != NULL)
-    *p = '-';
+  while ((q = strchr (mimetype_icon, '/')) != NULL)
+    *q = '-';
   
   p = strchr (type, '/');
   if (p == NULL)
@@ -675,7 +676,7 @@
   g_free (icon_names[1]);
   g_free (generic_mimetype_icon);
   
-  return G_ICON (themed_icon);
+  return themed_icon;
 }
 
 /**

Modified: trunk/gio/gunixvolume.c
==============================================================================
--- trunk/gio/gunixvolume.c	(original)
+++ trunk/gio/gunixvolume.c	Wed Feb 27 11:23:35 2008
@@ -391,6 +391,7 @@
 
 static void
 g_unix_volume_mount (GVolume    *volume,
+                     GMountMountFlags    flags,
                      GMountOperation     *mount_operation,
                      GCancellable        *cancellable,
                      GAsyncReadyCallback  callback,