[glib] GTestDBus: Don't call into gvfs
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] GTestDBus: Don't call into gvfs
- Date: Tue, 26 Jun 2012 16:26:51 +0000 (UTC)
commit d6aa3b3bdd9f0fe1d9f2d2eed1d881bc189bcfe8
Author: Colin Walters <walters verbum org>
Date: Mon Jun 25 20:46:28 2012 -0400
GTestDBus: Don't call into gvfs
https://bugzilla.gnome.org/show_bug.cgi?id=678808
gio/gtestdbus.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gio/gtestdbus.c b/gio/gtestdbus.c
index 171a4fe..ca71197 100644
--- a/gio/gtestdbus.c
+++ b/gio/gtestdbus.c
@@ -26,6 +26,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <gstdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -522,6 +523,7 @@ start_daemon (GTestDBus *self)
/* Write config file and set its path in argv */
file = write_config_file (self);
config_path = g_file_get_path (file);
+ g_object_unref (file);
config_arg = g_strdup_printf ("--config-file=%s", config_path);
argv[2] = config_arg;
@@ -570,9 +572,9 @@ start_daemon (GTestDBus *self)
g_assert_no_error (error);
g_io_channel_unref (channel);
- g_file_delete (file, NULL, &error);
- g_assert_no_error (error);
- g_object_unref (file);
+ /* Don't use g_file_delete since it calls into gvfs */
+ if (g_unlink (config_path) != 0)
+ g_assert_not_reached ();
g_free (config_path);
g_free (config_arg);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]