Merge lp:~ted/indicator-messages/glib-deprections into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 359
Merged at revision: 358
Proposed branch: lp:~ted/indicator-messages/glib-deprections
Merge into: lp:~indicator-applet-developers/indicator-messages/trunk.13.10
Diff against target: 179 lines (+19/-19)
3 files modified
src/app-section.c (+6/-6)
src/im-application-list.c (+7/-7)
test/test-gactionmuxer.cpp (+6/-6)
To merge this branch: bzr merge lp:~ted/indicator-messages/glib-deprections
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+181442@code.launchpad.net

Commit message

Migrate away from deprecated function

Description of the change

GLib 2.37.6 (in proposed, not in distro yet) makes these function deprecated.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app-section.c'
2--- src/app-section.c 2013-08-20 10:38:10 +0000
3+++ src/app-section.c 2013-08-22 01:52:18 +0000
4@@ -384,7 +384,7 @@
5
6 actions = g_action_group_list_actions (G_ACTION_GROUP (group));
7 for (it = actions; *it; it++)
8- g_simple_action_group_remove (group, *it);
9+ g_action_map_remove_action (G_ACTION_MAP(group), *it);
10
11 g_strfreev (actions);
12 }
13@@ -406,7 +406,7 @@
14 launch = g_simple_action_new_stateful ("launch", G_VARIANT_TYPE_UINT32, g_variant_new_boolean (is_running));
15 g_signal_connect (launch, "activate", G_CALLBACK (activate_cb), self);
16 g_signal_connect (launch, "change-state", G_CALLBACK (launch_action_change_state), self);
17- g_simple_action_group_insert (priv->static_shortcuts, G_ACTION (launch));
18+ g_action_map_add_action (G_ACTION_MAP(priv->static_shortcuts), G_ACTION (launch));
19
20 item = g_menu_item_new (g_app_info_get_name (G_APP_INFO (priv->appinfo)), "launch");
21 g_menu_item_set_attribute (item, "x-canonical-type", "s", "ImAppMenuItem");
22@@ -432,7 +432,7 @@
23
24 action = g_simple_action_new (nicks[i], G_VARIANT_TYPE_UINT32);
25 g_signal_connect(action, "activate", G_CALLBACK (nick_activate_cb), self);
26- g_simple_action_group_insert (priv->static_shortcuts, G_ACTION (action));
27+ g_action_map_add_action (G_ACTION_MAP(priv->static_shortcuts), G_ACTION (action));
28 g_object_unref (action);
29
30 item = g_menu_item_new (name, nicks[i]);
31@@ -659,7 +659,7 @@
32 }
33 }
34
35- g_simple_action_group_remove (priv->source_actions, id);
36+ g_action_map_remove_action (G_ACTION_MAP(priv->source_actions), id);
37 update_draws_attention (self);
38 }
39
40@@ -722,7 +722,7 @@
41 state = g_variant_new ("(uxsb)", count, time, string, draws_attention);
42 action = g_simple_action_new_stateful (id, NULL, state);
43 g_signal_connect (action, "activate", G_CALLBACK (source_action_activated), self);
44- g_simple_action_group_insert (priv->source_actions, G_ACTION (action));
45+ g_action_map_add_action (G_ACTION_MAP(priv->source_actions), G_ACTION (action));
46
47 item = g_menu_item_new (label, id);
48 g_menu_item_set_attribute (item, "x-canonical-type", "s", "ImSourceMenuItem");
49@@ -760,7 +760,7 @@
50 state = g_variant_new ("(uxsb)", count, time, string, draws_attention);
51 action = g_simple_action_new_stateful (id, NULL, state);
52
53- g_simple_action_group_insert (priv->source_actions, G_ACTION (action));
54+ g_action_map_add_action (G_ACTION_MAP(priv->source_actions), G_ACTION (action));
55
56 if (draws_attention && !priv->draws_attention) {
57 priv->draws_attention = TRUE;
58
59=== modified file 'src/im-application-list.c'
60--- src/im-application-list.c 2013-08-21 16:40:00 +0000
61+++ src/im-application-list.c 2013-08-22 01:52:18 +0000
62@@ -272,7 +272,7 @@
63 im_application_list_source_removed (Application *app,
64 const gchar *id)
65 {
66- g_simple_action_group_remove (app->source_actions, id);
67+ g_action_map_remove_action (G_ACTION_MAP(app->source_actions), id);
68
69 g_signal_emit (app->list, signals[SOURCE_REMOVED], 0, app->id, id);
70
71@@ -317,7 +317,7 @@
72 im_application_list_message_removed (Application *app,
73 const gchar *id)
74 {
75- g_simple_action_group_remove (app->message_actions, id);
76+ g_action_map_remove_action (G_ACTION_MAP(app->message_actions), id);
77 g_action_muxer_remove (app->message_sub_actions, id);
78
79 im_application_list_update_draws_attention (app->list);
80@@ -575,13 +575,13 @@
81 list->globalactions = g_simple_action_group_new ();
82 {
83 GSimpleAction * messages = g_simple_action_new_stateful("messages", G_VARIANT_TYPE("a{sv}"), g_variant_new_array(G_VARIANT_TYPE("{sv}"), NULL, 0));
84- g_simple_action_group_insert(list->globalactions, G_ACTION(messages));
85+ g_action_map_add_action(G_ACTION_MAP(list->globalactions), G_ACTION(messages));
86 }
87 g_simple_action_group_add_entries (list->globalactions, action_entries, G_N_ELEMENTS (action_entries), list);
88
89 list->statusaction = g_simple_action_new_stateful("status", G_VARIANT_TYPE_STRING, g_variant_new_string("offline"));
90 g_signal_connect(list->statusaction, "activate", G_CALLBACK(status_activated), list);
91- g_simple_action_group_insert(list->globalactions, G_ACTION(list->statusaction));
92+ g_action_map_add_action(G_ACTION_MAP(list->globalactions), G_ACTION(list->statusaction));
93
94 list->muxer = g_action_muxer_new ();
95 g_action_muxer_insert (list->muxer, NULL, G_ACTION_GROUP (list->globalactions));
96@@ -780,7 +780,7 @@
97 action = g_simple_action_new_stateful (id, G_VARIANT_TYPE_BOOLEAN, state);
98 g_signal_connect (action, "activate", G_CALLBACK (im_application_list_source_activated), app);
99
100- g_simple_action_group_insert (app->source_actions, G_ACTION (action));
101+ g_action_map_add_action (G_ACTION_MAP(app->source_actions), G_ACTION (action));
102
103 g_signal_emit (app->list, signals[SOURCE_ADDED], 0, app->id, id, label, iconstr);
104
105@@ -906,7 +906,7 @@
106 action = g_simple_action_new (id, G_VARIANT_TYPE_BOOLEAN);
107 g_object_set_qdata(G_OBJECT(action), message_action_draws_attention_quark(), GINT_TO_POINTER(draws_attention));
108 g_signal_connect (action, "activate", G_CALLBACK (im_application_list_message_activated), app);
109- g_simple_action_group_insert (app->message_actions, G_ACTION (action));
110+ g_action_map_add_action (G_ACTION_MAP(app->message_actions), G_ACTION (action));
111
112 {
113 GVariant *entry;
114@@ -939,7 +939,7 @@
115 action = g_simple_action_new (name, type ? G_VARIANT_TYPE (type) : NULL);
116 g_object_set_data_full (G_OBJECT (action), "message", g_strdup (id), g_free);
117 g_signal_connect (action, "activate", G_CALLBACK (im_application_list_sub_message_activated), app);
118- g_simple_action_group_insert (action_group, G_ACTION (action));
119+ g_action_map_add_action (G_ACTION_MAP(action_group), G_ACTION (action));
120
121 g_variant_builder_init (&dict_builder, G_VARIANT_TYPE ("a{sv}"));
122
123
124=== modified file 'test/test-gactionmuxer.cpp'
125--- test/test-gactionmuxer.cpp 2013-08-20 10:38:10 +0000
126+++ test/test-gactionmuxer.cpp 2013-08-22 01:52:18 +0000
127@@ -190,7 +190,7 @@
128
129 group = g_simple_action_group_new ();
130 action = g_simple_action_new ("one", G_VARIANT_TYPE_STRING);
131- g_simple_action_group_insert (group, G_ACTION (action));
132+ g_action_map_add_action (G_ACTION_MAP(group), G_ACTION (action));
133
134 muxer = g_action_muxer_new ();
135 g_action_muxer_insert (muxer, "first", G_ACTION_GROUP (group));
136@@ -275,7 +275,7 @@
137 group = g_simple_action_group_new ();
138
139 action = g_simple_action_new ("one", G_VARIANT_TYPE_STRING);
140- g_simple_action_group_insert (group, G_ACTION (action));
141+ g_action_map_add_action (G_ACTION_MAP(group), G_ACTION (action));
142 g_object_unref (action);
143
144 muxer = g_action_muxer_new ();
145@@ -300,7 +300,7 @@
146 closure.name = "first.two";
147 action = g_simple_action_new_stateful ("two", G_VARIANT_TYPE_STRING,
148 g_variant_new_string ("on"));
149- g_simple_action_group_insert (group, G_ACTION (action));
150+ g_action_map_add_action (G_ACTION_MAP(group), G_ACTION (action));
151 EXPECT_TRUE (closure.signal_ran);
152
153 /* disable the action */
154@@ -317,7 +317,7 @@
155 /* remove the first action */
156 closure.signal_ran = FALSE;
157 closure.name = "first.one";
158- g_simple_action_group_remove (group, "one");
159+ g_action_map_remove_action (G_ACTION_MAP(group), "one");
160 EXPECT_TRUE (closure.signal_ran);
161
162 /* remove the whole group, should be notified about "first.two" */
163@@ -361,14 +361,14 @@
164 group = g_simple_action_group_new ();
165
166 action = g_simple_action_new ("one", G_VARIANT_TYPE_STRING);
167- g_simple_action_group_insert (group, G_ACTION (action));
168+ g_action_map_add_action (G_ACTION_MAP(group), G_ACTION (action));
169 g_signal_connect (action, "activate",
170 G_CALLBACK (action_activated), (gpointer) &signal_ran);
171 g_object_unref (action);
172
173 action = g_simple_action_new_stateful ("two", NULL,
174 g_variant_new_string ("on"));
175- g_simple_action_group_insert (group, G_ACTION (action));
176+ g_action_map_add_action (G_ACTION_MAP(group), G_ACTION (action));
177 g_signal_connect (action, "change-state",
178 G_CALLBACK (action_change_state), (gpointer) &signal_ran);
179 g_object_unref (action);

Subscribers

People subscribed via source and target branches