Commit dfa4f8a8 authored by Andrés G. Aragoneses's avatar Andrés G. Aragoneses

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
parent 6ac3fc28
......@@ -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 ();
......
......@@ -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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment