[banshee] ThickClient: avoid using GConf workaround for --disable-gnome (bgo#692374)
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] ThickClient: avoid using GConf workaround for --disable-gnome (bgo#692374)
- Date: Sun, 4 May 2014 20:56:12 +0000 (UTC)
commit dfa4f8a804595630ae220a2b799ff17a100f1a63
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Sun May 4 22:56:01 2014 +0200
ThickClient: avoid using GConf workaround for --disable-gnome (bgo#692374)
Previous fix to make dbus-glib-1 dependency mandatory [1] when still
using GConf missed the fact that Mac and Windows builds are compiled
with --disable-gnome flag, and the workaround shouldn't be called in
these cases.
[1] https://git.gnome.org/browse/banshee/commit/?id=abdfd9c0786d159b7c24cbcff56eabd61f5d6b9a
.../Banshee.Gui/GtkBaseClient.cs | 2 ++
src/Core/Banshee.ThickClient/Makefile.am | 4 ++++
2 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
index baa1203..da37016 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
@@ -108,9 +108,11 @@ namespace Banshee.Gui
GLib.Thread.Init ();
}
+#if GNOME
// Using GConf from multiple threads causes crashes if multithreading is not initialized
explictly in dbus
// This is a workaround for bgo#692374
dbus_g_thread_init ();
+#endif
Gtk.Application.Init ();
diff --git a/src/Core/Banshee.ThickClient/Makefile.am b/src/Core/Banshee.ThickClient/Makefile.am
index ea2a8f8..557fbba 100644
--- a/src/Core/Banshee.ThickClient/Makefile.am
+++ b/src/Core/Banshee.ThickClient/Makefile.am
@@ -3,6 +3,10 @@ TARGET = library
ASSEMBLY_BUILD_FLAGS = -unsafe
LINK = $(REF_BANSHEE_THICKCLIENT)
+if ENABLE_GNOME
+BUILD_DEFINES = "-define:GNOME"
+endif
+
SOURCES = \
Banshee.Addins.Gui/AddinView.cs \
Banshee.CairoGlyphs/BansheeLineLogo.cs \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]