From 933172d4e62461859fe920c40235620148ce502d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 22 Oct 2011 22:51:45 -0400 Subject: Fix distcheck errors. --- shell/test/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'shell') diff --git a/shell/test/Makefile.am b/shell/test/Makefile.am index 5efa3785d6..c46229d146 100644 --- a/shell/test/Makefile.am +++ b/shell/test/Makefile.am @@ -9,6 +9,7 @@ libevolution_module_test_la_CPPFLAGS = \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/shell \ -DG_LOG_DOMAIN=\"evolution-test\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) libevolution_module_test_la_SOURCES = \ @@ -20,6 +21,8 @@ libevolution_module_test_la_SOURCES = \ libevolution_module_test_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) libevolution_module_test_la_LDFLAGS = \ -- cgit v1.2.3 From 8c67e84f9bf1803108f7a004513e37c6ef22d41f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 Oct 2011 09:42:48 +0200 Subject: Call g_thread_init() conditionally --- shell/main.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'shell') diff --git a/shell/main.c b/shell/main.c index bb056e3ded..5b76a2ed0b 100644 --- a/shell/main.c +++ b/shell/main.c @@ -492,8 +492,10 @@ main (gint argc, textdomain (GETTEXT_PACKAGE); g_type_init (); + #if !GLIB_CHECK_VERSION(2,31,0) if (!g_thread_get_initialized ()) g_thread_init (NULL); + #endif /* do not require Gtk+ for --force-shutdown */ if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) { -- cgit v1.2.3