From 0f7689e25e2fd241fbb55c78bad0d3aa16fd9705 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 17 Jan 2013 15:17:40 -0600
Subject: remove g_type_init() calls and bump glib minimum to 2.35.4, where
 g_type_init() is deprecated

---
 tests/test-indicator.cc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tests')

diff --git a/tests/test-indicator.cc b/tests/test-indicator.cc
index 67a2780..2480c94 100644
--- a/tests/test-indicator.cc
+++ b/tests/test-indicator.cc
@@ -34,7 +34,6 @@ namespace
     if (G_UNLIKELY(!initialized))
     {
       initialized = true;
-      g_type_init();
       g_setenv ("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE);
     }
   }
-- 
cgit v1.2.3


From 8e878ce271c308a42e218d0c1b73d7f128dab7cb Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Date: Tue, 22 Jan 2013 16:35:02 -0500
Subject: Update paths to gtest source.

---
 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 cc3b52a..f6387a0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,8 +12,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