Session Menu

Merge lp:~khurshid-alam/indicator-session/build-hirsute into lp:indicator-session

  1. build-hirsute
  2. Merge into trunk.16.10
Proposed by Khurshid Alam
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 512
Merged at revision: 510
Proposed branch: lp:~khurshid-alam/indicator-session/build-hirsute
Merge into: lp:indicator-session
Diff against target: 459 lines (+50/-70)
12 files modified
src/backend-dbus/actions.c (+4/-10)
src/backend-dbus/actions.h (+2/-2)
src/backend-dbus/guest.c (+4/-10)
src/backend-dbus/guest.h (+2/-2)
src/backend-dbus/users.c (+4/-10)
src/backend-dbus/users.h (+2/-2)
src/service.c (+4/-9)
tests/backend-mock-guest.c (+4/-10)
tests/backend-mock-guest.h (+2/-2)
tests/backend-mock-users.c (+4/-10)
tests/backend-mock-users.h (+2/-2)
tests/test-service.cc (+16/-1)
To merge this branch: bzr merge lp:~khurshid-alam/indicator-session/build-hirsute
Reviewer Review Type Date Requested Status
Alberts Muktupāvels Approve
Marco Trevisan (Treviño) Pending
Dmitry Shachnev Pending
Review via email: mp+401195@code.launchpad.net

Commit message

Fix various compiler warnings and deprecation warnings.

To post a comment you must log in.
Revision history for this message
Alberts Muktupāvels (muktupavels) :
lp:~khurshid-alam/indicator-session/build-hirsute updated
511. By Khurshid Alam

Fix whitespaces

Revision history for this message
Khurshid Alam (khurshid-alam) :
Revision history for this message
Alberts Muktupāvels (muktupavels) :
lp:~khurshid-alam/indicator-session/build-hirsute updated
512. By Khurshid Alam

Fix -Wincompatible-pointer-types warning with g_object_ref

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

Since there is no other release since hirsute this can be merged in impish.

Revision history for this message
Alberts Muktupāvels (muktupavels) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/backend-dbus/actions.c'
2--- src/backend-dbus/actions.c 2017-10-06 15:39:54 +0000
3+++ src/backend-dbus/actions.c 2021-04-17 05:48:45 +0000
4@@ -36,7 +36,7 @@
5 END_SESSION_TYPE_REBOOT
6 };
7
8-struct _IndicatorSessionActionsDbusPriv
9+struct _IndicatorSessionActionsDbusPrivate
10 {
11 GCancellable * cancellable;
12
13@@ -59,11 +59,9 @@
14 gboolean seat_allows_activation;
15 };
16
17-typedef IndicatorSessionActionsDbusPriv priv_t;
18+typedef IndicatorSessionActionsDbusPrivate priv_t;
19
20-G_DEFINE_TYPE (IndicatorSessionActionsDbus,
21- indicator_session_actions_dbus,
22- INDICATOR_TYPE_SESSION_ACTIONS)
23+G_DEFINE_TYPE_WITH_PRIVATE (IndicatorSessionActionsDbus, indicator_session_actions_dbus, INDICATOR_TYPE_SESSION_ACTIONS)
24
25 /***
26 ****
27@@ -1110,8 +1108,6 @@
28 actions_class->switch_to_greeter = my_switch_to_greeter;
29 actions_class->switch_to_guest = my_switch_to_guest;
30 actions_class->switch_to_username = my_switch_to_username;
31-
32- g_type_class_add_private (klass, sizeof (IndicatorSessionActionsDbusPriv));
33 }
34
35 static void
36@@ -1121,9 +1117,7 @@
37 priv_t * p;
38 GSettings * s;
39
40- p = G_TYPE_INSTANCE_GET_PRIVATE (self,
41- INDICATOR_TYPE_SESSION_ACTIONS_DBUS,
42- IndicatorSessionActionsDbusPriv);
43+ p = indicator_session_actions_dbus_get_instance_private (self);
44 p->cancellable = g_cancellable_new ();
45 p->seat_allows_activation = TRUE;
46 self->priv = p;
47
48=== modified file 'src/backend-dbus/actions.h'
49--- src/backend-dbus/actions.h 2013-06-28 15:31:51 +0000
50+++ src/backend-dbus/actions.h 2021-04-17 05:48:45 +0000
51@@ -37,7 +37,7 @@
52 #define INDICATOR_IS_SESSION_ACTIONS_DBUS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), INDICATOR_TYPE_SESSION_ACTIONS_DBUS))
53
54 typedef struct _IndicatorSessionActionsDbus IndicatorSessionActionsDbus;
55-typedef struct _IndicatorSessionActionsDbusPriv IndicatorSessionActionsDbusPriv;
56+typedef struct _IndicatorSessionActionsDbusPrivate IndicatorSessionActionsDbusPrivate;
57 typedef struct _IndicatorSessionActionsDbusClass IndicatorSessionActionsDbusClass;
58
59 /**
60@@ -48,7 +48,7 @@
61 {
62 /*< private >*/
63 IndicatorSessionActions parent;
64- IndicatorSessionActionsDbusPriv * priv;
65+ IndicatorSessionActionsDbusPrivate * priv;
66 };
67
68 struct _IndicatorSessionActionsDbusClass
69
70=== modified file 'src/backend-dbus/guest.c'
71--- src/backend-dbus/guest.c 2013-07-01 17:54:52 +0000
72+++ src/backend-dbus/guest.c 2021-04-17 05:48:45 +0000
73@@ -21,7 +21,7 @@
74
75 #include "guest.h"
76
77-struct _IndicatorSessionGuestDbusPriv
78+struct _IndicatorSessionGuestDbusPrivate
79 {
80 GCancellable * cancellable;
81
82@@ -34,11 +34,9 @@
83 gboolean guest_is_allowed;
84 };
85
86-typedef IndicatorSessionGuestDbusPriv priv_t;
87+typedef IndicatorSessionGuestDbusPrivate priv_t;
88
89-G_DEFINE_TYPE (IndicatorSessionGuestDbus,
90- indicator_session_guest_dbus,
91- INDICATOR_TYPE_SESSION_GUEST)
92+G_DEFINE_TYPE_WITH_PRIVATE (IndicatorSessionGuestDbus, indicator_session_guest_dbus, INDICATOR_TYPE_SESSION_GUEST)
93
94 /***
95 ****
96@@ -352,8 +350,6 @@
97 guest_class->is_logged_in = my_is_logged_in;
98 guest_class->is_active = my_is_active;
99 guest_class->switch_to_guest = my_switch_to_guest;
100-
101- g_type_class_add_private (klass, sizeof (IndicatorSessionGuestDbusPriv));
102 }
103
104 static void
105@@ -361,9 +357,7 @@
106 {
107 priv_t * p;
108
109- p = G_TYPE_INSTANCE_GET_PRIVATE (self,
110- INDICATOR_TYPE_SESSION_GUEST_DBUS,
111- IndicatorSessionGuestDbusPriv);
112+ p = indicator_session_guest_dbus_get_instance_private (self);
113 p->cancellable = g_cancellable_new ();
114 self->priv = p;
115 }
116
117=== modified file 'src/backend-dbus/guest.h'
118--- src/backend-dbus/guest.h 2013-06-28 15:31:51 +0000
119+++ src/backend-dbus/guest.h 2021-04-17 05:48:45 +0000
120@@ -37,7 +37,7 @@
121 #define INDICATOR_IS_SESSION_GUEST_DBUS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), INDICATOR_TYPE_SESSION_GUEST_DBUS))
122
123 typedef struct _IndicatorSessionGuestDbus IndicatorSessionGuestDbus;
124-typedef struct _IndicatorSessionGuestDbusPriv IndicatorSessionGuestDbusPriv;
125+typedef struct _IndicatorSessionGuestDbusPrivate IndicatorSessionGuestDbusPrivate;
126 typedef struct _IndicatorSessionGuestDbusClass IndicatorSessionGuestDbusClass;
127
128 /**
129@@ -48,7 +48,7 @@
130 {
131 /*< private >*/
132 IndicatorSessionGuest parent;
133- IndicatorSessionGuestDbusPriv * priv;
134+ IndicatorSessionGuestDbusPrivate * priv;
135 };
136
137 struct _IndicatorSessionGuestDbusClass
138
139=== modified file 'src/backend-dbus/users.c'
140--- src/backend-dbus/users.c 2013-07-01 18:28:05 +0000
141+++ src/backend-dbus/users.c 2021-04-17 05:48:45 +0000
142@@ -21,7 +21,7 @@
143
144 #include "users.h"
145
146-struct _IndicatorSessionUsersDbusPriv
147+struct _IndicatorSessionUsersDbusPrivate
148 {
149 Login1Manager * login1_manager;
150 Login1Seat * login1_seat;
151@@ -45,11 +45,9 @@
152 guint update_list_tag;
153 };
154
155-typedef IndicatorSessionUsersDbusPriv priv_t;
156+typedef IndicatorSessionUsersDbusPrivate priv_t;
157
158-G_DEFINE_TYPE (IndicatorSessionUsersDbus,
159- indicator_session_users_dbus,
160- INDICATOR_TYPE_SESSION_USERS)
161+G_DEFINE_TYPE_WITH_PRIVATE (IndicatorSessionUsersDbus, indicator_session_users_dbus, INDICATOR_TYPE_SESSION_USERS)
162
163 /***
164 ****
165@@ -655,8 +653,6 @@
166 users_class->get_uids = my_get_uids;
167 users_class->get_user = my_get_user;
168 users_class->activate_user = my_activate_user;
169-
170- g_type_class_add_private (klass, sizeof (IndicatorSessionUsersDbusPriv));
171 }
172
173 static void
174@@ -664,9 +660,7 @@
175 {
176 priv_t * p;
177
178- p = G_TYPE_INSTANCE_GET_PRIVATE (self,
179- INDICATOR_TYPE_SESSION_USERS_DBUS,
180- IndicatorSessionUsersDbusPriv);
181+ p = indicator_session_users_dbus_get_instance_private (self);
182 self->priv = p;
183 p->cancellable = g_cancellable_new ();
184
185
186=== modified file 'src/backend-dbus/users.h'
187--- src/backend-dbus/users.h 2013-06-28 15:31:51 +0000
188+++ src/backend-dbus/users.h 2021-04-17 05:48:45 +0000
189@@ -37,7 +37,7 @@
190 #define INDICATOR_IS_SESSION_USERS_DBUS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), INDICATOR_TYPE_SESSION_USERS_DBUS))
191
192 typedef struct _IndicatorSessionUsersDbus IndicatorSessionUsersDbus;
193-typedef struct _IndicatorSessionUsersDbusPriv IndicatorSessionUsersDbusPriv;
194+typedef struct _IndicatorSessionUsersDbusPrivate IndicatorSessionUsersDbusPrivate;
195 typedef struct _IndicatorSessionUsersDbusClass IndicatorSessionUsersDbusClass;
196
197 /**
198@@ -48,7 +48,7 @@
199 {
200 /*< private >*/
201 IndicatorSessionUsers parent;
202- IndicatorSessionUsersDbusPriv * priv;
203+ IndicatorSessionUsersDbusPrivate * priv;
204 };
205
206 struct _IndicatorSessionUsersDbusClass
207
208=== modified file 'src/service.c'
209--- src/service.c 2021-03-26 20:26:29 +0000
210+++ src/service.c 2021-04-17 05:48:45 +0000
211@@ -32,9 +32,6 @@
212 #define ICON_INFO "system-devices-panel-information"
213 #define ICON_ALERT "system-devices-panel-alert"
214
215-G_DEFINE_TYPE (IndicatorSessionService,
216- indicator_session_service,
217- G_TYPE_OBJECT)
218
219 /* signals enum */
220 enum
221@@ -120,6 +117,8 @@
222
223 typedef IndicatorSessionServicePrivate priv_t;
224
225+G_DEFINE_TYPE_WITH_PRIVATE (IndicatorSessionService, indicator_session_service, G_TYPE_OBJECT)
226+
227 static const char * get_current_real_name (IndicatorSessionService * self);
228
229 /***
230@@ -1209,7 +1208,7 @@
231
232 g_debug ("bus acquired: %s", name);
233
234- p->conn = g_object_ref (G_OBJECT (connection));
235+ p->conn = g_object_ref (connection);
236
237 /* export the actions */
238 if ((id = g_dbus_connection_export_action_group (connection,
239@@ -1332,9 +1331,7 @@
240 GSettingsSchema * usage_mode_schema;
241
242 /* init our priv pointer */
243- p = G_TYPE_INSTANCE_GET_PRIVATE (self,
244- INDICATOR_TYPE_SESSION_SERVICE,
245- IndicatorSessionServicePrivate);
246+ p = indicator_session_service_get_instance_private (self);
247 p->indicator_settings = g_settings_new ("com.canonical.indicator.session");
248 if (desktop_is_unity ())
249 p->keybinding_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.media-keys");
250@@ -1544,8 +1541,6 @@
251 object_class->get_property = my_get_property;
252 object_class->set_property = my_set_property;
253
254- g_type_class_add_private (klass, sizeof (IndicatorSessionServicePrivate));
255-
256 signals[NAME_LOST] = g_signal_new (INDICATOR_SESSION_SERVICE_SIGNAL_NAME_LOST,
257 G_TYPE_FROM_CLASS(klass),
258 G_SIGNAL_RUN_LAST,
259
260=== modified file 'tests/backend-mock-guest.c'
261--- tests/backend-mock-guest.c 2013-06-29 02:15:15 +0000
262+++ tests/backend-mock-guest.c 2021-04-17 05:48:45 +0000
263@@ -21,18 +21,16 @@
264
265 #include "backend-mock-guest.h"
266
267-struct _IndicatorSessionGuestMockPriv
268+struct _IndicatorSessionGuestMockPrivate
269 {
270 gboolean guest_is_active;
271 gboolean guest_is_logged_in;
272 gboolean guest_is_allowed;
273 };
274
275-typedef IndicatorSessionGuestMockPriv priv_t;
276+typedef IndicatorSessionGuestMockPrivate priv_t;
277
278-G_DEFINE_TYPE (IndicatorSessionGuestMock,
279- indicator_session_guest_mock,
280- INDICATOR_TYPE_SESSION_GUEST)
281+G_DEFINE_TYPE_WITH_PRIVATE (IndicatorSessionGuestMock, indicator_session_guest_mock, INDICATOR_TYPE_SESSION_GUEST)
282
283 /**
284 *** IndicatorSessionGuest virtual functions
285@@ -100,8 +98,6 @@
286 guest_class->is_logged_in = my_is_logged_in;
287 guest_class->is_active = my_is_active;
288 guest_class->switch_to_guest = my_switch_to_guest;
289-
290- g_type_class_add_private (klass, sizeof (IndicatorSessionGuestMockPriv));
291 }
292
293 static void
294@@ -110,9 +106,7 @@
295 {
296 priv_t * p;
297
298- p = G_TYPE_INSTANCE_GET_PRIVATE (self,
299- INDICATOR_TYPE_SESSION_GUEST_MOCK,
300- IndicatorSessionGuestMockPriv);
301+ p = indicator_session_guest_mock_get_instance_private (self);
302 self->priv = p;
303
304 p->guest_is_allowed = TRUE;
305
306=== modified file 'tests/backend-mock-guest.h'
307--- tests/backend-mock-guest.h 2013-06-28 15:31:51 +0000
308+++ tests/backend-mock-guest.h 2021-04-17 05:48:45 +0000
309@@ -33,7 +33,7 @@
310 #define INDICATOR_IS_SESSION_GUEST_MOCK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), INDICATOR_TYPE_SESSION_GUEST_MOCK))
311
312 typedef struct _IndicatorSessionGuestMock IndicatorSessionGuestMock;
313-typedef struct _IndicatorSessionGuestMockPriv IndicatorSessionGuestMockPriv;
314+typedef struct _IndicatorSessionGuestMockPrivate IndicatorSessionGuestMockPrivate;
315 typedef struct _IndicatorSessionGuestMockClass IndicatorSessionGuestMockClass;
316
317 /**
318@@ -43,7 +43,7 @@
319 {
320 /*< private >*/
321 IndicatorSessionGuest parent;
322- IndicatorSessionGuestMockPriv * priv;
323+ IndicatorSessionGuestMockPrivate * priv;
324 };
325
326 struct _IndicatorSessionGuestMockClass
327
328=== modified file 'tests/backend-mock-users.c'
329--- tests/backend-mock-users.c 2013-06-29 02:15:15 +0000
330+++ tests/backend-mock-users.c 2021-04-17 05:48:45 +0000
331@@ -20,16 +20,14 @@
332 #include "backend-mock.h"
333 #include "backend-mock-users.h"
334
335-struct _IndicatorSessionUsersMockPriv
336+struct _IndicatorSessionUsersMockPrivate
337 {
338 GHashTable * users;
339 };
340
341-typedef IndicatorSessionUsersMockPriv priv_t;
342+typedef IndicatorSessionUsersMockPrivate priv_t;
343
344-G_DEFINE_TYPE (IndicatorSessionUsersMock,
345- indicator_session_users_mock,
346- INDICATOR_TYPE_SESSION_USERS)
347+G_DEFINE_TYPE_WITH_PRIVATE (IndicatorSessionUsersMock, indicator_session_users_mock, INDICATOR_TYPE_SESSION_USERS)
348
349 /***
350 **** IndicatorSessionUsers virtual functions
351@@ -120,8 +118,6 @@
352 users_class->get_uids = my_get_uids;
353 users_class->get_user = my_get_user;
354 users_class->activate_user = my_activate_user;
355-
356- g_type_class_add_private (klass, sizeof (IndicatorSessionUsersMockPriv));
357 }
358
359 static void
360@@ -130,9 +126,7 @@
361 {
362 priv_t * p;
363
364- p = G_TYPE_INSTANCE_GET_PRIVATE (self,
365- INDICATOR_TYPE_SESSION_USERS_MOCK,
366- IndicatorSessionUsersMockPriv);
367+ p = indicator_session_users_mock_get_instance_private (self);
368 self->priv = p;
369
370 p->users = g_hash_table_new_full (g_direct_hash,
371
372=== modified file 'tests/backend-mock-users.h'
373--- tests/backend-mock-users.h 2013-06-28 15:31:51 +0000
374+++ tests/backend-mock-users.h 2021-04-17 05:48:45 +0000
375@@ -33,7 +33,7 @@
376 #define INDICATOR_IS_SESSION_USERS_MOCK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), INDICATOR_TYPE_SESSION_USERS_MOCK))
377
378 typedef struct _IndicatorSessionUsersMock IndicatorSessionUsersMock;
379-typedef struct _IndicatorSessionUsersMockPriv IndicatorSessionUsersMockPriv;
380+typedef struct _IndicatorSessionUsersMockPrivate IndicatorSessionUsersMockPrivate;
381 typedef struct _IndicatorSessionUsersMockClass IndicatorSessionUsersMockClass;
382
383 /**
384@@ -43,7 +43,7 @@
385 {
386 /*< private >*/
387 IndicatorSessionUsers parent;
388- IndicatorSessionUsersMockPriv * priv;
389+ IndicatorSessionUsersMockPrivate * priv;
390 };
391
392 struct _IndicatorSessionUsersMockClass
393
394=== modified file 'tests/test-service.cc'
395--- tests/test-service.cc 2014-07-11 01:18:20 +0000
396+++ tests/test-service.cc 2021-04-17 05:48:45 +0000
397@@ -24,6 +24,13 @@
398 #include "backend-mock-guest.h"
399 #include "backend-mock-actions.h"
400
401+gboolean onMainLoopQuit (gpointer user_data)
402+{
403+ g_main_loop_quit ((GMainLoop*) user_data);
404+
405+ return FALSE;
406+}
407+
408 /***
409 ****
410 ***/
411@@ -169,7 +176,7 @@
412 G_BUS_NAME_WATCHER_FLAGS_NONE,
413 on_name_appeared, // quits the loop
414 NULL, this, NULL);
415- const guint timer_id = g_timeout_add_seconds (TIME_LIMIT_SEC, (GSourceFunc)g_main_loop_quit, loop);
416+ const guint timer_id = g_timeout_add_seconds (TIME_LIMIT_SEC, onMainLoopQuit, loop);
417 g_main_loop_run (loop);
418 g_source_remove (timer_id);
419 g_bus_unwatch_name (watch_id);
420@@ -520,7 +527,9 @@
421 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.switch-to-screensaver"));
422 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.logout"));
423 if (action_menuitem_exists ("indicator.reboot"))
424+ {
425 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.reboot"));
426+ }
427 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.power-off"));
428
429 // now toggle the can-prompt flag
430@@ -534,7 +543,9 @@
431 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.switch-to-greeter"));
432 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.logout"));
433 if (action_menuitem_exists ("indicator.reboot"))
434+ {
435 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.reboot"));
436+ }
437 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.power-off"));
438
439 // cleanup
440@@ -567,7 +578,9 @@
441 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.switch-to-screensaver"));
442 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.logout"));
443 if (action_menuitem_exists ("indicator.reboot"))
444+ {
445 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.reboot"));
446+ }
447 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.power-off"));
448
449 // now toggle the can-prompt flag
450@@ -581,7 +594,9 @@
451 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.switch-to-greeter"));
452 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.logout"));
453 if (action_menuitem_exists ("indicator.reboot"))
454+ {
455 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.reboot"));
456+ }
457 ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.power-off"));
458
459 // cleanup

Subscribers

People subscribed via source and target branches