[gvfs] daemon: Drop no-longer-necessary libdbus thread init bits
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] daemon: Drop no-longer-necessary libdbus thread init bits
- Date: Tue, 21 Aug 2012 14:38:09 +0000 (UTC)
commit 7d4bd61385cd56db5507ee31b14724244b637da4
Author: Colin Walters <walters verbum org>
Date: Tue Aug 21 10:36:17 2012 -0400
daemon: Drop no-longer-necessary libdbus thread init bits
Build regression introduced by 288e9153f1f6efdb1243ad4d8589519326f3ec94
daemon/daemon-main.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/daemon/daemon-main.c b/daemon/daemon-main.c
index cca291c..4f5fb60 100644
--- a/daemon/daemon-main.c
+++ b/daemon/daemon-main.c
@@ -34,10 +34,6 @@
#include <gvfsbackend.h>
#include <gvfsdbus.h>
-#if HAVE_KEYRING
-# include <dbus/dbus.h>
-#endif
-
static char *spawner_id = NULL;
static char *spawner_path = NULL;
@@ -70,10 +66,6 @@ daemon_init (void)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
-#if HAVE_KEYRING
- /* gnome-keyring needs d-bus threads properly initialized */
- dbus_threads_init_default ();
-#endif
g_type_init ();
g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, log_debug, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]