aboutsummaryrefslogtreecommitdiff
path: root/test/test-gactionmuxer.cpp
diff options
context:
space:
mode:
authorSergio Schvezov <sergio.schvezov@canonical.com>2013-03-22 16:54:38 -0300
committerSergio Schvezov <sergio.schvezov@canonical.com>2013-03-22 16:54:38 -0300
commit5e3abf725e0628673c1bb16869edc67dfa7e2729 (patch)
tree5d6bd2d445d4280280f8f1a24d805c3ed412105f /test/test-gactionmuxer.cpp
parent8fd0c5cf4246c6788024212d794a3f3f8741d2ed (diff)
downloadayatana-indicator-messages-5e3abf725e0628673c1bb16869edc67dfa7e2729.tar.gz
ayatana-indicator-messages-5e3abf725e0628673c1bb16869edc67dfa7e2729.tar.bz2
ayatana-indicator-messages-5e3abf725e0628673c1bb16869edc67dfa7e2729.zip
Adding glib version guard to g_type_init
Diffstat (limited to 'test/test-gactionmuxer.cpp')
-rw-r--r--test/test-gactionmuxer.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/test-gactionmuxer.cpp b/test/test-gactionmuxer.cpp
index de51211..efd6e4f 100644
--- a/test/test-gactionmuxer.cpp
+++ b/test/test-gactionmuxer.cpp
@@ -43,7 +43,9 @@ 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);
@@ -64,7 +66,9 @@ 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 ();
@@ -85,7 +89,9 @@ 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,
@@ -178,7 +184,9 @@ 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);