Re-do merge

3 files changed, 41 insertions, 2 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 4f1a163..c39aea4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -38,8 +38,8 @@ noinst_LTLIBRARIES = \
 	libindicator-messages-service.la
 
 libindicator_messages_service_la_SOURCES = \
-	$(top_builddir)/src/indicator-messages-service.c \
-	$(top_builddir)/src/indicator-messages-service.h \
+	$(top_builddir)/common/indicator-messages-service.c \
+	$(top_builddir)/common/indicator-messages-service.h \
 	$(top_srcdir)/src/app-section.c \
 	$(top_srcdir)/src/app-section.h \
 	$(top_srcdir)/src/gactionmuxer.c \
@@ -53,6 +53,7 @@ libindicator_messages_service_la_CFLAGS = \
 	$(APPLET_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	-I$(top_builddir)/src \
+	-I$(top_builddir)/common \
 	-Wall \
 	-Wl,-Bsymbolic-functions \
 	-Wl,-z,defs \
diff --git a/test/indicator-messages-service-activate.c b/test/indicator-messages-service-activate.c
index b0ec9b7..f5a26b0 100644
--- a/test/indicator-messages-service-activate.c
+++ b/test/indicator-messages-service-activate.c
@@ -28,6 +28,10 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 int
 main (int argc, char ** argv)
 {
+#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
+	g_type_init();
+#endif
+
 	guint returnval = 0;
 	GError * error = NULL;
 
diff --git a/test/test-gactionmuxer.cpp b/test/test-gactionmuxer.cpp
index b80f86d..efd6e4f 100644
--- a/test/test-gactionmuxer.cpp
+++ b/test/test-gactionmuxer.cpp
@@ -1,3 +1,21 @@
+/*
+An indicator to show information that is in messaging applications
+that the user is using.
+
+Copyright 2012 Canonical Ltd.
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -25,6 +43,10 @@ strv_contains (gchar **str_array,
 TEST(GActionMuxerTest, Sanity) {
 	GActionMuxer *muxer;
 
+#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
+	g_type_init ();
+#endif
+
 	g_action_muxer_insert (NULL, NULL, NULL);
 	g_action_muxer_remove (NULL, NULL);
 
@@ -44,6 +66,10 @@ TEST(GActionMuxerTest, Empty) {
 	GActionMuxer *muxer;
 	gchar **actions;
 
+#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
+	g_type_init ();
+#endif
+
 	muxer = g_action_muxer_new ();
 
 	actions = g_action_group_list_actions (G_ACTION_GROUP (muxer));
@@ -63,6 +89,10 @@ TEST(GActionMuxerTest, AddAndRemove) {
 	GActionMuxer *muxer;
 	gchar **actions;
 
+#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
+	g_type_init ();
+#endif
+
 	group1 = g_simple_action_group_new ();
 	g_simple_action_group_add_entries (group1,
 					   entries1,
@@ -154,6 +184,10 @@ TEST(GActionMuxerTest, ActionAttributes) {
 	GVariant *state_hint[2];
 	GVariant *state[2];
 
+#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
+	g_type_init ();
+#endif
+
 	group = g_simple_action_group_new ();
 	action = g_simple_action_new ("one", G_VARIANT_TYPE_STRING);
 	g_simple_action_group_insert (group, G_ACTION (action));