[banshee/stable-2.6] ThickClient: avoid using GConf workaround for --disable-gnome (bgo#692374)

[Andrés Aragoneses <aaragoneses src gnome org>]

commit f8eb081878821af6649dc711b5ff844f98d38f9a
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 599bf1b..e1051d4 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
@@ -112,9 +112,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 3e7a0ff..9d93b1b 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 \