Mercurial > pidgin
changeset 25281:45375ae20cd6
merge of '91c54e1cd7a33198f97836ac32ab8f3f3111efe6'
and 'b1fa9aff4c34ce047c572504619d09fd47c9d6be'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Wed, 07 Jan 2009 04:43:38 +0000 |
| parents | 1e121a3eceeb (current diff) c72b77a638a1 (diff) |
| children | c0255d214741 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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();
--- 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\"