aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-10-24 17:30:20 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-10-24 17:30:20 +0800
commitbd149b27954af20cf3f860164486191b0e879e89 (patch)
tree323c26ba15a7e15242c2749b391b5ffa59762fed /shell
parent3b32549c69267295a9a7b482e4a6ca2db9e6c73f (diff)
parent8c67e84f9bf1803108f7a004513e37c6ef22d41f (diff)
downloadgsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar
gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.gz
gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.bz2
gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.lz
gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.xz
gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.zst
gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.zip
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'shell')
-rw-r--r--shell/main.c2
-rw-r--r--shell/test/Makefile.am3
2 files changed, 5 insertions, 0 deletions
diff --git a/shell/main.c b/shell/main.c
index 5e79c308f7..fe12559748 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -482,8 +482,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")) {
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 = \