# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1231303418 0
# Node ID 45375ae20cd68f351caecc583035087a9ca894f0
# Parent  1e121a3eceebec4a3e30b0d7f71966f830b5fd52# Parent  c72b77a638a108e5925b0cb8ae1c091a3062834e
merge of '91c54e1cd7a33198f97836ac32ab8f3f3111efe6'
     and 'b1fa9aff4c34ce047c572504619d09fd47c9d6be'

diff -r 1e121a3eceeb -r 45375ae20cd6 libpurple/dbus-server.c
--- a/libpurple/dbus-server.c	Wed Jan 07 04:39:28 2009 +0000
+++ b/libpurple/dbus-server.c	Wed Jan 07 04:43:38 2009 +0000
@@ -803,7 +803,8 @@
 void
 purple_dbus_init(void)
 {
-	dbus_g_thread_init();
+	if (g_thread_supported())
+		dbus_g_thread_init();
 
 	purple_dbus_init_ids();
 
diff -r 1e121a3eceeb -r 45375ae20cd6 libpurple/protocols/sametime/Makefile.am
--- a/libpurple/protocols/sametime/Makefile.am	Wed Jan 07 04:39:28 2009 +0000
+++ b/libpurple/protocols/sametime/Makefile.am	Wed Jan 07 04:43:38 2009 +0000
@@ -8,24 +8,22 @@
 SAMETIMESOURCES = sametime.c
 
 AM_CFLAGS = \
-	$(st) \
-	-DG_LOG_DOMAIN=\"sametime\"
+	$(st)
 
 if STATIC_SAMETIME
 
 st = -DPURPLE_STATIC_PRPL
 noinst_LTLIBRARIES     = libsametime.la
-libsametime_la_SOURCES = $(SAMETIMESOURCES)
 libsametime_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
 st =
 pkg_LTLIBRARIES     = libsametime.la
-libsametime_la_SOURCES = $(SAMETIMESOURCES)
 
 endif
 
+libsametime_la_SOURCES = $(SAMETIMESOURCES)
 libsametime_la_LDFLAGS = -module -avoid-version
 libsametime_la_LIBADD = $(GLIB_LIBS) $(MEANWHILE_LIBS)
 
@@ -34,5 +32,6 @@
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(MEANWHILE_CFLAGS)
+	$(MEANWHILE_CFLAGS) \
+	-DG_LOG_DOMAIN=\"sametime\"