From 027a06e9d59885a8f961ff83987b338c7c33755f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 21 Aug 2013 20:46:47 -0500
Subject: Swap g_simple_action_group_insert() for g_action_map_add_action()

---
 test/test-gactionmuxer.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/test-gactionmuxer.cpp b/test/test-gactionmuxer.cpp
index efd6e4f..029e997 100644
--- a/test/test-gactionmuxer.cpp
+++ b/test/test-gactionmuxer.cpp
@@ -190,7 +190,7 @@ TEST(GActionMuxerTest, ActionAttributes) {
 
 	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));
+	g_action_map_add_action (G_ACTION_MAP(group), G_ACTION (action));
 
 	muxer = g_action_muxer_new ();
 	g_action_muxer_insert (muxer, "first", G_ACTION_GROUP (group));
@@ -275,7 +275,7 @@ TEST(GActionMuxerTest, Signals) {
 	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));
+	g_action_map_add_action (G_ACTION_MAP(group), G_ACTION (action));
 	g_object_unref (action);
 
 	muxer = g_action_muxer_new ();
@@ -300,7 +300,7 @@ TEST(GActionMuxerTest, Signals) {
 	closure.name = "first.two";
 	action = g_simple_action_new_stateful ("two", G_VARIANT_TYPE_STRING,
 					       g_variant_new_string ("on"));
-	g_simple_action_group_insert (group, G_ACTION (action));
+	g_action_map_add_action (G_ACTION_MAP(group), G_ACTION (action));
 	EXPECT_TRUE (closure.signal_ran);
 
 	/* disable the action */
@@ -361,14 +361,14 @@ TEST(GActionMuxerTest, ActivateAction) {
 	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));
+	g_action_map_add_action (G_ACTION_MAP(group), G_ACTION (action));
 	g_signal_connect (action, "activate",
 			  G_CALLBACK (action_activated), (gpointer) &signal_ran);
 	g_object_unref (action);
 
 	action = g_simple_action_new_stateful ("two", NULL,
 					       g_variant_new_string ("on"));
-	g_simple_action_group_insert (group, G_ACTION (action));
+	g_action_map_add_action (G_ACTION_MAP(group), G_ACTION (action));
 	g_signal_connect (action, "change-state",
 			  G_CALLBACK (action_change_state), (gpointer) &signal_ran);
 	g_object_unref (action);
-- 
cgit v1.2.3


From a8c93f9ae22d515c092bed0e4dca7873a78f2d88 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 21 Aug 2013 20:50:07 -0500
Subject: Change g_simple_action_group_remove() to g_action_map_remove_action()

---
 test/test-gactionmuxer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/test-gactionmuxer.cpp b/test/test-gactionmuxer.cpp
index 029e997..498d3dd 100644
--- a/test/test-gactionmuxer.cpp
+++ b/test/test-gactionmuxer.cpp
@@ -317,7 +317,7 @@ TEST(GActionMuxerTest, Signals) {
 	/* remove the first action */
 	closure.signal_ran = FALSE;
 	closure.name = "first.one";
-	g_simple_action_group_remove (group, "one");
+	g_action_map_remove_action (G_ACTION_MAP(group), "one");
 	EXPECT_TRUE (closure.signal_ran);
 
 	/* remove the whole group, should be notified about "first.two" */
-- 
cgit v1.2.3