luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-15 06:47:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix type warnings

Browse Source 
2008-02-27  Alexander Larsson  <alexl@redhat.com>

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


svn path=/trunk/; revision=6599
This commit is contained in:
Alexander Larsson 2008-02-27 11:23:35 +00:00 committed by Alexander Larsson
parent f0e54fd328
commit 82046b6c97
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gio/ChangeLog
View File

@ -1,3 +1,12 @@
2008-02-27 Alexander Larsson <alexl@redhat.com>
* gcontenttype.c:
Fix type warnings
* gunixvolume.c:
(g_unix_volume_mount):
Add missing GMountMountFlags argument
2008-02-26 Alexander Larsson <alexl@redhat.com> 2008-02-26 Alexander Larsson <alexl@redhat.com>
* glocalfile.c: * glocalfile.c:

11
gio/gcontenttype.c
View File

@ -644,16 +644,17 @@ g_content_type_get_mime_type (const char *type)
GIcon * GIcon *
g_content_type_get_icon (const char *type) 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]; char *icon_names[3];
GThemedIcon *themed_icon; const char *p;
GIcon *themed_icon;
g_return_val_if_fail (type != NULL, NULL); g_return_val_if_fail (type != NULL, NULL);
mimetype_icon = g_strdup (type); mimetype_icon = g_strdup (type);
while ((p = strchr (mimetype_icon, '/')) != NULL) while ((q = strchr (mimetype_icon, '/')) != NULL)
*p = '-'; *q = '-';
p = strchr (type, '/'); p = strchr (type, '/');
if (p == NULL) if (p == NULL)
@ -675,7 +676,7 @@ g_content_type_get_icon (const char *type)
g_free (icon_names[1]); g_free (icon_names[1]);
g_free (generic_mimetype_icon); g_free (generic_mimetype_icon);
return G_ICON (themed_icon); return themed_icon;
} }
/** /**

1
gio/gunixvolume.c
View File

@ -391,6 +391,7 @@ eject_mount_do (GVolume *volume,
static void static void
g_unix_volume_mount (GVolume *volume, g_unix_volume_mount (GVolume *volume,
GMountMountFlags flags,
GMountOperation *mount_operation, GMountOperation *mount_operation,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,