Merge lp:~larsu/indicator-messages/dont-use-deprecated-functions into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

[Lars Karlitski]

Don't use deprecated g_simple_action_group_{lookup,insert}

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:359
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/78/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/31/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/78/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

LGTM, want to let Jenkins have another go before top-approval?

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2013-08-22 01:50:07 +0000
+++ src/im-application-list.c	2013-08-22 13:23:16 +0000
@@ -204,7 +204,7 @@
   /* Set the state */
   g_action_group_change_action_state (G_ACTION_GROUP(list->globalactions), "messages", g_variant_builder_end(&builder));
 
-  GAction * remove_action = g_simple_action_group_lookup(list->globalactions, "remove-all");
+  GAction * remove_action = g_action_map_lookup_action (G_ACTION_MAP (list->globalactions), "remove-all");
   if (g_hash_table_find (list->applications, application_has_items, NULL)) {
     g_debug("Enabling remove-all");
     g_simple_action_set_enabled(G_SIMPLE_ACTION(remove_action), TRUE);
@@ -239,7 +239,7 @@
 app_message_action_check_draw (Application * app, const gchar * action_name)
 {
   GAction * action = NULL;
-  action = g_simple_action_group_lookup (app->message_actions, action_name);
+  action = g_action_map_lookup_action (G_ACTION_MAP (app->message_actions), action_name);
   return GPOINTER_TO_INT(g_object_get_qdata(G_OBJECT(action), message_action_draws_attention_quark()));
 }
 
@@ -577,7 +577,7 @@
     GSimpleAction * messages = g_simple_action_new_stateful("messages", G_VARIANT_TYPE("a{sv}"), g_variant_new_array(G_VARIANT_TYPE("{sv}"), NULL, 0));
     g_action_map_add_action(G_ACTION_MAP(list->globalactions), G_ACTION(messages));
   }
-  g_simple_action_group_add_entries (list->globalactions, action_entries, G_N_ELEMENTS (action_entries), list);
+  g_action_map_add_action_entries (G_ACTION_MAP (list->globalactions), action_entries, G_N_ELEMENTS (action_entries), list);
 
   list->statusaction = g_simple_action_new_stateful("status", G_VARIANT_TYPE_STRING, g_variant_new_string("offline"));
   g_signal_connect(list->statusaction, "activate", G_CALLBACK(status_activated), list);

=== modified file 'test/test-gactionmuxer.cpp'
--- test/test-gactionmuxer.cpp	2013-08-22 01:50:07 +0000
+++ test/test-gactionmuxer.cpp	2013-08-22 13:23:16 +0000
@@ -94,22 +94,22 @@
 #endif
 
 	group1 = g_simple_action_group_new ();
-	g_simple_action_group_add_entries (group1,
-					   entries1,
-					   G_N_ELEMENTS (entries1),
-					   NULL);
+	g_action_map_add_action_entries (G_ACTION_MAP (group1),
+					 entries1,
+					 G_N_ELEMENTS (entries1),
+					 NULL);
 
 	group2 = g_simple_action_group_new ();
-	g_simple_action_group_add_entries (group2,
-					   entries2,
-					   G_N_ELEMENTS (entries2),
-					   NULL);
+	g_action_map_add_action_entries (G_ACTION_MAP (group2),
+					 entries2,
+					 G_N_ELEMENTS (entries2),
+					 NULL);
 
 	group3 = g_simple_action_group_new ();
-	g_simple_action_group_add_entries (group3,
-					   entries3,
-					   G_N_ELEMENTS (entries3),
-					   NULL);
+	g_action_map_add_action_entries (G_ACTION_MAP (group3),
+					 entries3,
+					 G_N_ELEMENTS (entries3),
+					 NULL);
 
 	muxer = g_action_muxer_new ();
 	g_action_muxer_insert (muxer, "first", G_ACTION_GROUP (group1));