From ac4566b7b88ee291a6e3c97ab2bfc34f12db03f0 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 22 Jan 2013 09:33:58 -0500 Subject: Remove the uses of deprecated g_type_init(). --- tests/test-service.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'tests') diff --git a/tests/test-service.cc b/tests/test-service.cc index 4d540d6..b1ca5bc 100644 --- a/tests/test-service.cc +++ b/tests/test-service.cc @@ -49,7 +49,6 @@ class ClientTest : public ::testing::Test static bool first_run = true; if (first_run) { - g_type_init(); g_setenv ("INDICATOR_SERVICE_SHUTDOWN_TIMEOUT", "1000", TRUE); g_unsetenv ("INDICATOR_ALLOW_NO_WATCHERS"); g_unsetenv ("INDICATOR_SERVICE_REPLACE_MODE"); -- cgit v1.2.3 From 9021cd15af70142b29300c42196891d8e282b0f7 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 22 Jan 2013 09:53:59 -0500 Subject: Revise path to gtest source files; the files moved in libxorg-gtest-dev --- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index c117c95..579f502 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,8 +15,8 @@ include $(srcdir)/Makefile.am.strings check_LIBRARIES = libgtest.a nodist_libgtest_a_SOURCES = \ - $(GTEST_SOURCE)/src/gtest-all.cc \ - $(GTEST_SOURCE)/src/gtest_main.cc + $(GTEST_SOURCE)/gtest-all.cc \ + $(GTEST_SOURCE)/gtest_main.cc AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I${top_srcdir}/src -Wall -Werror AM_CXXFLAGS = $(GTEST_CXXFLAGS) -- cgit v1.2.3