diff options
| author | Alexander Larsson <alexl@redhat.com> | 2007-12-20 11:05:06 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-12-20 11:05:06 +0000 |
| commit | 906960ade0efac716394ab7d09e7daf6dcdc3ace (patch) | |
| tree | e04ee82ce7b608ee3da9c94e665334667be78329 | |
| parent | faaf7894836bea18f7321c544846dc241834fa67 (diff) | |
| download | gvfs-906960ade0efac716394ab7d09e7daf6dcdc3ace.tar.gz | |
Fix warnings
2007-12-20 Alexander Larsson <alexl@redhat.com>
* client/gdaemonfileinputstream.c:
* client/gdaemonfileoutputstream.c:
* client/gdaemonvfs.c:
* client/gvfsfusedaemon.c:
Fix warnings
svn path=/trunk/; revision=1056
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | client/gdaemonfileinputstream.c | 5 | ||||
| -rw-r--r-- | client/gdaemonfileoutputstream.c | 7 | ||||
| -rw-r--r-- | client/gdaemonvfs.c | 2 | ||||
| -rw-r--r-- | client/gvfsfusedaemon.c | 2 |
5 files changed, 20 insertions, 4 deletions
@@ -1,5 +1,13 @@ 2007-12-20 Alexander Larsson <alexl@redhat.com> + * client/gdaemonfileinputstream.c: + * client/gdaemonfileoutputstream.c: + * client/gdaemonvfs.c: + * client/gvfsfusedaemon.c: + Fix warnings + +2007-12-20 Alexander Larsson <alexl@redhat.com> + * daemon/Makefile.am: Build without cdda. Patch from nf2@scheinwelt.at diff --git a/client/gdaemonfileinputstream.c b/client/gdaemonfileinputstream.c index b66e13bb..f4908434 100644 --- a/client/gdaemonfileinputstream.c +++ b/client/gdaemonfileinputstream.c @@ -430,7 +430,10 @@ run_sync_state_machine (GDaemonFileInputStream *file, &io_error); } else - g_assert_not_reached (); + { + res = 0; + g_assert_not_reached (); + } if (res == -1) { diff --git a/client/gdaemonfileoutputstream.c b/client/gdaemonfileoutputstream.c index 0916df08..3520dd8a 100644 --- a/client/gdaemonfileoutputstream.c +++ b/client/gdaemonfileoutputstream.c @@ -35,6 +35,8 @@ #include <glib/gstdio.h> #include <glib/gi18n-lib.h> #include <gio/gio.h> +#include <gio/gunixinputstream.h> +#include <gio/gunixoutputstream.h> #include "gdaemonfileoutputstream.h" #include "gvfsdaemondbus.h" #include <gvfsdaemonprotocol.h> @@ -380,7 +382,10 @@ run_sync_state_machine (GDaemonFileOutputStream *file, &io_error); } else - g_assert_not_reached (); + { + res = 0; + g_assert_not_reached (); + } if (res == -1) { diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c index 5906b9c2..9461478b 100644 --- a/client/gdaemonvfs.c +++ b/client/gdaemonvfs.c @@ -224,7 +224,7 @@ g_daemon_vfs_init (GDaemonVfs *vfs) } /* The above should have ref:ed the modules anyway */ - g_list_foreach (modules, g_type_module_unuse, NULL); + g_list_foreach (modules, (GFunc)g_type_module_unuse, NULL); g_list_free (modules); g_free (mappers); } diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c index 92ecea35..2af66b38 100644 --- a/client/gvfsfusedaemon.c +++ b/client/gvfsfusedaemon.c @@ -304,7 +304,7 @@ mount_record_new (GMount *mount) mount_record = g_new (MountRecord, 1); mount_record->root = g_mount_get_root (mount); - name = g_object_get_data (mount, "g-stable-name"); + name = g_object_get_data (G_OBJECT (mount), "g-stable-name"); if (name != NULL) name = g_strdup (name); else |