Merge lp:~charlesk/indicator-session/dont-use-deprecated-actiongroup-apis into lp:indicator-session/13.10

Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 406
Merged at revision: 408
Proposed branch: lp:~charlesk/indicator-session/dont-use-deprecated-actiongroup-apis
Merge into: lp:indicator-session/13.10
Diff against target: 27 lines (+3/-3)
1 file modified
src/service.c (+3/-3)
To merge this branch: bzr merge lp:~charlesk/indicator-session/dont-use-deprecated-actiongroup-apis
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ted Gould (community) Approve
Review via email: mp+181589@code.launchpad.net

Description of the change

remove deprecated GSimpleActionGroup API use

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/service.c'
2--- src/service.c 2013-08-20 14:20:18 +0000
3+++ src/service.c 2013-08-22 15:06:11 +0000
4@@ -752,20 +752,20 @@
5 v = create_guest_switcher_state (self);
6 a = g_simple_action_new_stateful ("switch-to-guest", NULL, v);
7 g_signal_connect (a, "activate", G_CALLBACK(on_guest_activated), self);
8- g_simple_action_group_insert (p->actions, G_ACTION(a));
9+ g_action_map_add_action (G_ACTION_MAP (p->actions), G_ACTION(a));
10 p->guest_switcher_action = a;
11
12 /* add switch-to-user action... parameter is the uesrname */
13 v = create_user_switcher_state (self);
14 a = g_simple_action_new_stateful ("switch-to-user", G_VARIANT_TYPE_STRING, v);
15 g_signal_connect (a, "activate", G_CALLBACK(on_user_activated), self);
16- g_simple_action_group_insert (p->actions, G_ACTION(a));
17+ g_action_map_add_action (G_ACTION_MAP (p->actions), G_ACTION(a));
18 p->user_switcher_action = a;
19
20 /* add the header action */
21 v = g_variant_new ("(sssb)", "label", ICON_DEFAULT, "a11y", TRUE);
22 a = g_simple_action_new_stateful ("_header", NULL, v);
23- g_simple_action_group_insert (p->actions, G_ACTION(a));
24+ g_action_map_add_action (G_ACTION_MAP (p->actions), G_ACTION(a));
25 p->header_action = a;
26
27 rebuild_now (self, SECTION_HEADER);

Subscribers

People subscribed via source and target branches