Unity HUD

Merge lp:~ted/hud/glib-deprecations into lp:hud/13.10

  1. glib-deprecations
  2. Merge into trunk.13.10
Proposed by Ted Gould
Status: Merged
Approved by: Antti Kaijanmäki
Approved revision: 313
Merged at revision: 313
Proposed branch: lp:~ted/hud/glib-deprecations
Merge into: lp:hud/13.10
Diff against target: 148 lines (+18/-18)
8 files modified
tests/test-application-source.c (+1/-1)
tests/test-menu-input-model-deep.c (+2/-2)
tests/test-menu-input-model-shortcuts.c (+3/-3)
tests/test-menu-input-model-simple.c (+2/-2)
tests/test-menu-input-model-toolbar-all.c (+2/-2)
tests/test-menu-input-model-toolbar-dynamic.c (+4/-4)
tests/test-menu-input-model-toolbar-undo.c (+2/-2)
tests/test-menu-input-model-toolbar-unknown.c (+2/-2)
To merge this branch: bzr merge lp:~ted/hud/glib-deprecations
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Antti Kaijanmäki (community) Approve
Charles Kerr (community) Approve
Review via email: mp+181444@code.launchpad.net

Commit message

Migrate from g_simple_action_group_insert to g_action_map_add_action

Description of the change

Deprecated in Glib 2.37.6 (in proposed, not in distro yet)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:313
http://jenkins.qa.ubuntu.com/job/hud-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-amd64-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-i386-ci/74

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-ci/113/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/hud-autolanding/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-amd64-autolanding/52
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-saucy-armhf-autolanding/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-i386-autolanding/52

review: Needs Fixing (continuous-integration)
Revision history for this message
Antti Kaijanmäki (kaijanmaki) :
review: Approve
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 'tests/test-application-source.c'
2--- tests/test-application-source.c 2013-06-18 14:21:29 +0000
3+++ tests/test-application-source.c 2013-08-22 02:08:21 +0000
4@@ -127,7 +127,7 @@
5 hud_application_source_set_focused_win(source, 1);
6
7 GSimpleActionGroup * simple_group = g_simple_action_group_new();
8- g_simple_action_group_insert(simple_group, G_ACTION(g_simple_action_new("action-name", NULL)));
9+ g_action_map_add_action(G_ACTION_MAP(simple_group), G_ACTION(g_simple_action_new("action-name", NULL)));
10 GActionGroup * group = G_ACTION_GROUP(simple_group);
11 g_assert(group);
12 g_assert(g_simple_action_group_lookup(simple_group, "action-name"));
13
14=== modified file 'tests/test-menu-input-model-deep.c'
15--- tests/test-menu-input-model-deep.c 2013-01-23 23:05:50 +0000
16+++ tests/test-menu-input-model-deep.c 2013-08-22 02:08:21 +0000
17@@ -76,9 +76,9 @@
18
19 GSimpleActionGroup * ag = g_simple_action_group_new();
20 if (is_application)
21- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("app.simple", G_VARIANT_TYPE_BOOLEAN)));
22+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("app.simple", G_VARIANT_TYPE_BOOLEAN)));
23 else
24- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("simple", G_VARIANT_TYPE_BOOLEAN)));
25+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("simple", G_VARIANT_TYPE_BOOLEAN)));
26
27 GDBusConnection * session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
28
29
30=== modified file 'tests/test-menu-input-model-shortcuts.c'
31--- tests/test-menu-input-model-shortcuts.c 2013-01-17 20:52:35 +0000
32+++ tests/test-menu-input-model-shortcuts.c 2013-08-22 02:08:21 +0000
33@@ -51,9 +51,9 @@
34 g_menu_append_item(menu, mi);
35
36 GSimpleActionGroup * ag = g_simple_action_group_new();
37- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("save", G_VARIANT_TYPE_BOOLEAN)));
38- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("quiter", G_VARIANT_TYPE_BOOLEAN)));
39- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("close", G_VARIANT_TYPE_BOOLEAN)));
40+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("save", G_VARIANT_TYPE_BOOLEAN)));
41+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("quiter", G_VARIANT_TYPE_BOOLEAN)));
42+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("close", G_VARIANT_TYPE_BOOLEAN)));
43
44 GDBusConnection * session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
45
46
47=== modified file 'tests/test-menu-input-model-simple.c'
48--- tests/test-menu-input-model-simple.c 2013-02-15 17:53:33 +0000
49+++ tests/test-menu-input-model-simple.c 2013-08-22 02:08:21 +0000
50@@ -47,9 +47,9 @@
51
52 GSimpleActionGroup * ag = g_simple_action_group_new();
53 if (is_application)
54- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("app.simple", G_VARIANT_TYPE_BOOLEAN)));
55+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("app.simple", G_VARIANT_TYPE_BOOLEAN)));
56 else
57- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("simple", G_VARIANT_TYPE_BOOLEAN)));
58+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("simple", G_VARIANT_TYPE_BOOLEAN)));
59
60 GDBusConnection * session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
61
62
63=== modified file 'tests/test-menu-input-model-toolbar-all.c'
64--- tests/test-menu-input-model-toolbar-all.c 2013-05-17 19:26:38 +0000
65+++ tests/test-menu-input-model-toolbar-all.c 2013-08-22 02:08:21 +0000
66@@ -61,9 +61,9 @@
67
68 GSimpleActionGroup * ag = g_simple_action_group_new();
69 if (is_application)
70- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("app.simple", G_VARIANT_TYPE_BOOLEAN)));
71+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("app.simple", G_VARIANT_TYPE_BOOLEAN)));
72 else
73- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("simple", G_VARIANT_TYPE_BOOLEAN)));
74+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("simple", G_VARIANT_TYPE_BOOLEAN)));
75
76 GDBusConnection * session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
77
78
79=== modified file 'tests/test-menu-input-model-toolbar-dynamic.c'
80--- tests/test-menu-input-model-toolbar-dynamic.c 2013-06-04 21:53:09 +0000
81+++ tests/test-menu-input-model-toolbar-dynamic.c 2013-08-22 02:08:21 +0000
82@@ -72,7 +72,7 @@
83
84 undo_action = G_ACTION(g_simple_action_new("undo", NULL));
85 g_signal_connect(G_OBJECT(undo_action), "activate", G_CALLBACK(undo_activated), NULL);
86- g_simple_action_group_insert(ag, undo_action);
87+ g_action_map_add_action(G_ACTION_MAP(ag), undo_action);
88
89 /* Peferences, adds the help item */
90 pref_item = g_menu_item_new("Preferences Item", "preferences");
91@@ -81,7 +81,7 @@
92
93 pref_action = G_ACTION(g_simple_action_new("preferences", NULL));
94 g_signal_connect(G_OBJECT(pref_action), "activate", G_CALLBACK(prefs_activated), NULL);
95- g_simple_action_group_insert(ag, pref_action);
96+ g_action_map_add_action(G_ACTION_MAP(ag), pref_action);
97
98 /* Fullscreen, starts disabled */
99 full_item = g_menu_item_new("Fullscreen Item", "fullscreen");
100@@ -90,7 +90,7 @@
101
102 full_action = G_ACTION(g_simple_action_new("fullscreen", NULL));
103 g_simple_action_set_enabled(G_SIMPLE_ACTION(full_action), FALSE);
104- g_simple_action_group_insert(ag, full_action);
105+ g_action_map_add_action(G_ACTION_MAP(ag), full_action);
106
107 /* Help, not added at first */
108 help_item = g_menu_item_new("Help Item", "help");
109@@ -98,7 +98,7 @@
110 /* NO! Can't you read! g_menu_append_item(menu, help_item); */
111
112 help_action = G_ACTION(g_simple_action_new("help", NULL));
113- g_simple_action_group_insert(ag, help_action);
114+ g_action_map_add_action(G_ACTION_MAP(ag), help_action);
115
116
117 /* All the rest of the boring stuff */
118
119=== modified file 'tests/test-menu-input-model-toolbar-undo.c'
120--- tests/test-menu-input-model-toolbar-undo.c 2013-05-16 03:36:38 +0000
121+++ tests/test-menu-input-model-toolbar-undo.c 2013-08-22 02:08:21 +0000
122@@ -46,9 +46,9 @@
123
124 GSimpleActionGroup * ag = g_simple_action_group_new();
125 if (is_application)
126- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("app.simple", G_VARIANT_TYPE_BOOLEAN)));
127+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("app.simple", G_VARIANT_TYPE_BOOLEAN)));
128 else
129- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("simple", G_VARIANT_TYPE_BOOLEAN)));
130+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("simple", G_VARIANT_TYPE_BOOLEAN)));
131
132 GDBusConnection * session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
133
134
135=== modified file 'tests/test-menu-input-model-toolbar-unknown.c'
136--- tests/test-menu-input-model-toolbar-unknown.c 2013-05-16 03:41:58 +0000
137+++ tests/test-menu-input-model-toolbar-unknown.c 2013-08-22 02:08:21 +0000
138@@ -46,9 +46,9 @@
139
140 GSimpleActionGroup * ag = g_simple_action_group_new();
141 if (is_application)
142- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("app.simple", G_VARIANT_TYPE_BOOLEAN)));
143+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("app.simple", G_VARIANT_TYPE_BOOLEAN)));
144 else
145- g_simple_action_group_insert(ag, G_ACTION(g_simple_action_new("simple", G_VARIANT_TYPE_BOOLEAN)));
146+ g_action_map_add_action(G_ACTION_MAP(ag), G_ACTION(g_simple_action_new("simple", G_VARIANT_TYPE_BOOLEAN)));
147
148 GDBusConnection * session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
149

Subscribers

People subscribed via source and target branches