summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2011-03-17 19:01:17 +0100
committerTomas Bzatek <tbzatek@redhat.com>2011-03-17 19:01:17 +0100
commit08120de3bdf768ed6d1a935ce05b64f9ddecadc0 (patch)
treebff58f236ff267fe21c377f488f11ea08544c0c9 /client
parentcdc5849ea5067573a278c7d5f1a21c14c5b0686a (diff)
Cleanups and fixes for compiler warnings
https://bugzilla.gnome.org/show_bug.cgi?id=641856
Diffstat (limited to 'client')
-rw-r--r--client/gdaemonfile.c2
-rw-r--r--client/gdaemonfileinputstream.c3
-rw-r--r--client/gdaemonfileoutputstream.c3
-rw-r--r--client/gdaemonvfs.c3
-rw-r--r--client/gdaemonvolumemonitor.c4
5 files changed, 2 insertions, 13 deletions
diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c
index 58f22308..ccb06827 100644
--- a/client/gdaemonfile.c
+++ b/client/gdaemonfile.c
@@ -1684,7 +1684,7 @@ g_daemon_file_poll_mountable (GFile *file,
callback, user_data,
poll_mountable_async_cb,
NULL,
- 0,
+ NULL,
0);
}
diff --git a/client/gdaemonfileinputstream.c b/client/gdaemonfileinputstream.c
index c942c9ea..45918321 100644
--- a/client/gdaemonfileinputstream.c
+++ b/client/gdaemonfileinputstream.c
@@ -2035,14 +2035,11 @@ async_query_done (GInputStream *stream,
GCancellable *cancellable,
GError *io_error)
{
- GDaemonFileInputStream *file;
GSimpleAsyncResult *simple;
QueryOperation *op;
GFileInfo *info;
GError *error;
- file = G_DAEMON_FILE_INPUT_STREAM (stream);
-
op = op_data;
if (io_error)
diff --git a/client/gdaemonfileoutputstream.c b/client/gdaemonfileoutputstream.c
index c5263e14..74e4caff 100644
--- a/client/gdaemonfileoutputstream.c
+++ b/client/gdaemonfileoutputstream.c
@@ -1564,14 +1564,11 @@ async_query_done (GOutputStream *stream,
GCancellable *cancellable,
GError *io_error)
{
- GDaemonFileOutputStream *file;
GSimpleAsyncResult *simple;
QueryOperation *op;
GFileInfo *info;
GError *error;
- file = G_DAEMON_FILE_OUTPUT_STREAM (stream);
-
op = op_data;
if (io_error)
diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
index 59131b09..0cc884aa 100644
--- a/client/gdaemonvfs.c
+++ b/client/gdaemonvfs.c
@@ -614,7 +614,7 @@ fill_mountable_info (GDaemonVfs *vfs)
DBusMessageIter iter, array_iter, struct_iter;
MountableInfo *info;
GPtrArray *infos, *uri_schemes;
- gint i, count;
+ gint i;
message = dbus_message_new_method_call (G_VFS_DBUS_DAEMON_NAME,
G_VFS_DBUS_MOUNTTRACKER_PATH,
@@ -649,7 +649,6 @@ fill_mountable_info (GDaemonVfs *vfs)
infos = g_ptr_array_new ();
uri_schemes = g_ptr_array_new ();
g_ptr_array_add (uri_schemes, g_strdup ("file"));
- count = 0;
do
{
char *type, *scheme, **scheme_aliases;
diff --git a/client/gdaemonvolumemonitor.c b/client/gdaemonvolumemonitor.c
index 2ca21130..c254511c 100644
--- a/client/gdaemonvolumemonitor.c
+++ b/client/gdaemonvolumemonitor.c
@@ -249,10 +249,6 @@ g_daemon_volume_monitor_finalize (GObject *object)
static void
g_daemon_volume_monitor_dispose (GObject *object)
{
- GDaemonVolumeMonitor *monitor;
-
- monitor = G_DAEMON_VOLUME_MONITOR (object);
-
G_LOCK (daemon_vm);
_the_daemon_volume_monitor = NULL;
G_UNLOCK (daemon_vm);