aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2013-08-21 20:50:07 -0500
committerTed Gould <ted@gould.cx>2013-08-21 20:50:07 -0500
commita8c93f9ae22d515c092bed0e4dca7873a78f2d88 (patch)
tree2152a01c63cd3c0fd37f95cabe7afde0addecd06
parent027a06e9d59885a8f961ff83987b338c7c33755f (diff)
downloadayatana-indicator-messages-a8c93f9ae22d515c092bed0e4dca7873a78f2d88.tar.gz
ayatana-indicator-messages-a8c93f9ae22d515c092bed0e4dca7873a78f2d88.tar.bz2
ayatana-indicator-messages-a8c93f9ae22d515c092bed0e4dca7873a78f2d88.zip
Change g_simple_action_group_remove() to g_action_map_remove_action()
-rw-r--r--src/app-section.c4
-rw-r--r--src/im-application-list.c4
-rw-r--r--test/test-gactionmuxer.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/app-section.c b/src/app-section.c
index 6f955e7..a741172 100644
--- a/src/app-section.c
+++ b/src/app-section.c
@@ -384,7 +384,7 @@ g_simple_action_group_clear (GSimpleActionGroup *group)
actions = g_action_group_list_actions (G_ACTION_GROUP (group));
for (it = actions; *it; it++)
- g_simple_action_group_remove (group, *it);
+ g_action_map_remove_action (G_ACTION_MAP(group), *it);
g_strfreev (actions);
}
@@ -659,7 +659,7 @@ remove_source (AppSection *self,
}
}
- g_simple_action_group_remove (priv->source_actions, id);
+ g_action_map_remove_action (G_ACTION_MAP(priv->source_actions), id);
update_draws_attention (self);
}
diff --git a/src/im-application-list.c b/src/im-application-list.c
index 755168a..d69609d 100644
--- a/src/im-application-list.c
+++ b/src/im-application-list.c
@@ -272,7 +272,7 @@ static void
im_application_list_source_removed (Application *app,
const gchar *id)
{
- g_simple_action_group_remove (app->source_actions, id);
+ g_action_map_remove_action (G_ACTION_MAP(app->source_actions), id);
g_signal_emit (app->list, signals[SOURCE_REMOVED], 0, app->id, id);
@@ -317,7 +317,7 @@ static void
im_application_list_message_removed (Application *app,
const gchar *id)
{
- g_simple_action_group_remove (app->message_actions, id);
+ g_action_map_remove_action (G_ACTION_MAP(app->message_actions), id);
g_action_muxer_remove (app->message_sub_actions, id);
im_application_list_update_draws_attention (app->list);
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" */