Merge lp:~jgonzalezdr/lightdm/refactor_signal_constants into lp:lightdm
- refactor_signal_constants
- Merge into trunk
Proposed by
Jesús González
Status: | Merged |
---|---|
Merged at revision: | 2077 |
Proposed branch: | lp:~jgonzalezdr/lightdm/refactor_signal_constants |
Merge into: | lp:lightdm |
Diff against target: |
1170 lines (+190/-123) 40 files modified
common/user-list.c (+6/-6) common/user-list.h (+6/-0) liblightdm-gobject/greeter.c (+6/-6) liblightdm-gobject/lightdm/greeter.h (+7/-0) liblightdm-gobject/lightdm/user.h (+6/-0) liblightdm-gobject/user.c (+8/-8) liblightdm-qt/greeter.cpp (+6/-6) liblightdm-qt/usersmodel.cpp (+3/-3) src/display-manager.c (+4/-4) src/display-manager.h (+4/-0) src/display-server.c (+2/-2) src/display-server.h (+3/-0) src/greeter.c (+10/-10) src/greeter.h (+8/-0) src/lightdm.c (+14/-14) src/login1.c (+3/-3) src/login1.h (+5/-0) src/process.c (+3/-3) src/process.h (+4/-0) src/seat-unity.c (+3/-3) src/seat-xlocal.c (+3/-3) src/seat.c (+14/-14) src/seat.h (+5/-0) src/session.c (+3/-3) src/session.h (+4/-0) src/shared-data-manager.c (+1/-1) src/unity-system-compositor.c (+1/-1) src/vnc-server.c (+1/-1) src/vnc-server.h (+2/-0) src/x-server-local.c (+2/-2) src/x-server-xvnc.c (+2/-2) src/xdmcp-server.c (+1/-1) src/xdmcp-server.h (+2/-0) tests/src/X.c (+7/-7) tests/src/Xvnc.c (+2/-2) tests/src/test-gobject-greeter.c (+9/-9) tests/src/x-server.c (+4/-4) tests/src/x-server.h (+5/-0) tests/src/xdmcp-client.c (+5/-5) tests/src/xdmcp-client.h (+6/-0) |
To merge this branch: | bzr merge lp:~jgonzalezdr/lightdm/refactor_signal_constants |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Ancell | Approve | ||
Review via email: mp+236439@code.launchpad.net |
Commit message
Description of the change
As proposed in another MP, hardcoded strings representing signal names have been replaced in the whole code by common constants, in an attempt to slightly improve code robustness.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'common/user-list.c' |
2 | --- common/user-list.c 2014-05-12 11:32:49 +0000 |
3 | +++ common/user-list.c 2014-09-29 23:49:17 +0000 |
4 | @@ -407,7 +407,7 @@ |
5 | { |
6 | CommonUser *info = link->data; |
7 | g_debug ("User %s added", common_user_get_name (info)); |
8 | - g_signal_connect (info, "changed", G_CALLBACK (user_changed_cb), NULL); |
9 | + g_signal_connect (info, USER_SIGNAL_CHANGED, G_CALLBACK (user_changed_cb), NULL); |
10 | if (emit_add_signal) |
11 | g_signal_emit (user_list, list_signals[USER_ADDED], 0, info); |
12 | } |
13 | @@ -603,7 +603,7 @@ |
14 | g_debug ("User %s added", path); |
15 | priv->user_list = user_list; |
16 | priv->path = g_strdup (path); |
17 | - g_signal_connect (user, "changed", G_CALLBACK (user_changed_cb), NULL); |
18 | + g_signal_connect (user, USER_SIGNAL_CHANGED, G_CALLBACK (user_changed_cb), NULL); |
19 | if (load_accounts_user (user)) |
20 | { |
21 | list_priv->users = g_list_insert_sorted (list_priv->users, user, compare_user); |
22 | @@ -1090,7 +1090,7 @@ |
23 | * The ::user-added signal gets emitted when a user account is created. |
24 | **/ |
25 | list_signals[USER_ADDED] = |
26 | - g_signal_new ("user-added", |
27 | + g_signal_new (USER_LIST_SIGNAL_USER_ADDED, |
28 | G_TYPE_FROM_CLASS (klass), |
29 | G_SIGNAL_RUN_LAST, |
30 | G_STRUCT_OFFSET (CommonUserListClass, user_added), |
31 | @@ -1106,7 +1106,7 @@ |
32 | * The ::user-changed signal gets emitted when a user account is modified. |
33 | **/ |
34 | list_signals[USER_CHANGED] = |
35 | - g_signal_new ("user-changed", |
36 | + g_signal_new (USER_LIST_SIGNAL_USER_CHANGED, |
37 | G_TYPE_FROM_CLASS (klass), |
38 | G_SIGNAL_RUN_LAST, |
39 | G_STRUCT_OFFSET (CommonUserListClass, user_changed), |
40 | @@ -1122,7 +1122,7 @@ |
41 | * The ::user-removed signal gets emitted when a user account is removed. |
42 | **/ |
43 | list_signals[USER_REMOVED] = |
44 | - g_signal_new ("user-removed", |
45 | + g_signal_new (USER_LIST_SIGNAL_USER_REMOVED, |
46 | G_TYPE_FROM_CLASS (klass), |
47 | G_SIGNAL_RUN_LAST, |
48 | G_STRUCT_OFFSET (CommonUserListClass, user_removed), |
49 | @@ -1763,7 +1763,7 @@ |
50 | * The ::changed signal gets emitted this user account is modified. |
51 | **/ |
52 | user_signals[CHANGED] = |
53 | - g_signal_new ("changed", |
54 | + g_signal_new (USER_SIGNAL_CHANGED, |
55 | G_TYPE_FROM_CLASS (klass), |
56 | G_SIGNAL_RUN_LAST, |
57 | G_STRUCT_OFFSET (CommonUserClass, changed), |
58 | |
59 | === modified file 'common/user-list.h' |
60 | --- common/user-list.h 2014-02-08 22:33:57 +0000 |
61 | +++ common/user-list.h 2014-09-29 23:49:17 +0000 |
62 | @@ -32,6 +32,12 @@ |
63 | #define COMMON_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), COMMON_TYPE_USER)) |
64 | #define COMMON_USER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), COMMON_TYPE_USER, CommonUserClass)) |
65 | |
66 | +#define USER_LIST_SIGNAL_USER_ADDED "user-added" |
67 | +#define USER_LIST_SIGNAL_USER_CHANGED "user-changed" |
68 | +#define USER_LIST_SIGNAL_USER_REMOVED "user-removed" |
69 | + |
70 | +#define USER_SIGNAL_CHANGED "changed" |
71 | + |
72 | typedef struct |
73 | { |
74 | GObject parent_instance; |
75 | |
76 | === modified file 'liblightdm-gobject/greeter.c' |
77 | --- liblightdm-gobject/greeter.c 2014-09-19 03:16:14 +0000 |
78 | +++ liblightdm-gobject/greeter.c 2014-09-29 23:49:17 +0000 |
79 | @@ -1804,7 +1804,7 @@ |
80 | * lightdm_greeter_cancel_authentication() to abort the authentication. |
81 | **/ |
82 | signals[SHOW_PROMPT] = |
83 | - g_signal_new ("show-prompt", |
84 | + g_signal_new (LIGHTDM_GREETER_SIGNAL_SHOW_PROMPT, |
85 | G_TYPE_FROM_CLASS (klass), |
86 | G_SIGNAL_RUN_LAST, |
87 | G_STRUCT_OFFSET (LightDMGreeterClass, show_prompt), |
88 | @@ -1822,7 +1822,7 @@ |
89 | * should show a message to the user. |
90 | **/ |
91 | signals[SHOW_MESSAGE] = |
92 | - g_signal_new ("show-message", |
93 | + g_signal_new (LIGHTDM_GREETER_SIGNAL_SHOW_MESSAGE, |
94 | G_TYPE_FROM_CLASS (klass), |
95 | G_SIGNAL_RUN_LAST, |
96 | G_STRUCT_OFFSET (LightDMGreeterClass, show_message), |
97 | @@ -1841,7 +1841,7 @@ |
98 | * was successful. |
99 | **/ |
100 | signals[AUTHENTICATION_COMPLETE] = |
101 | - g_signal_new ("authentication-complete", |
102 | + g_signal_new (LIGHTDM_GREETER_SIGNAL_AUTHENTICATION_COMPLETE, |
103 | G_TYPE_FROM_CLASS (klass), |
104 | G_SIGNAL_RUN_LAST, |
105 | G_STRUCT_OFFSET (LightDMGreeterClass, authentication_complete), |
106 | @@ -1857,7 +1857,7 @@ |
107 | * The application should then call lightdm_greeter_login(). |
108 | **/ |
109 | signals[AUTOLOGIN_TIMER_EXPIRED] = |
110 | - g_signal_new ("autologin-timer-expired", |
111 | + g_signal_new (LIGHTDM_GREETER_SIGNAL_AUTOLOGIN_TIMER_EXPIRED, |
112 | G_TYPE_FROM_CLASS (klass), |
113 | G_SIGNAL_RUN_LAST, |
114 | G_STRUCT_OFFSET (LightDMGreeterClass, autologin_timer_expired), |
115 | @@ -1876,7 +1876,7 @@ |
116 | * resettable using lightdm_greeter_set_resettable(). |
117 | **/ |
118 | signals[IDLE] = |
119 | - g_signal_new ("idle", |
120 | + g_signal_new (LIGHTDM_GREETER_SIGNAL_IDLE, |
121 | G_TYPE_FROM_CLASS (klass), |
122 | G_SIGNAL_RUN_LAST, |
123 | G_STRUCT_OFFSET (LightDMGreeterClass, idle), |
124 | @@ -1895,7 +1895,7 @@ |
125 | * resettable using lightdm_greeter_set_resettable(). |
126 | **/ |
127 | signals[RESET] = |
128 | - g_signal_new ("reset", |
129 | + g_signal_new (LIGHTDM_GREETER_SIGNAL_RESET, |
130 | G_TYPE_FROM_CLASS (klass), |
131 | G_SIGNAL_RUN_LAST, |
132 | G_STRUCT_OFFSET (LightDMGreeterClass, reset), |
133 | |
134 | === modified file 'liblightdm-gobject/lightdm/greeter.h' |
135 | --- liblightdm-gobject/lightdm/greeter.h 2014-05-06 04:06:32 +0000 |
136 | +++ liblightdm-gobject/lightdm/greeter.h 2014-09-29 23:49:17 +0000 |
137 | @@ -23,6 +23,13 @@ |
138 | #define LIGHTDM_IS_GREETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_GREETER)) |
139 | #define LIGHTDM_GREETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeterClass)) |
140 | |
141 | +#define LIGHTDM_GREETER_SIGNAL_SHOW_PROMPT "show-prompt" |
142 | +#define LIGHTDM_GREETER_SIGNAL_SHOW_MESSAGE "show-message" |
143 | +#define LIGHTDM_GREETER_SIGNAL_AUTHENTICATION_COMPLETE "authentication-complete" |
144 | +#define LIGHTDM_GREETER_SIGNAL_AUTOLOGIN_TIMER_EXPIRED "autologin-timer-expired" |
145 | +#define LIGHTDM_GREETER_SIGNAL_IDLE "idle" |
146 | +#define LIGHTDM_GREETER_SIGNAL_RESET "reset" |
147 | + |
148 | /** |
149 | * LightDMPromptType: |
150 | * @LIGHTDM_PROMPT_TYPE_QUESTION: Prompt is a question. The information can be shown as it is entered. |
151 | |
152 | === modified file 'liblightdm-gobject/lightdm/user.h' |
153 | --- liblightdm-gobject/lightdm/user.h 2014-05-09 10:37:13 +0000 |
154 | +++ liblightdm-gobject/lightdm/user.h 2014-09-29 23:49:17 +0000 |
155 | @@ -29,6 +29,12 @@ |
156 | #define LIGHTDM_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_USER)) |
157 | #define LIGHTDM_USER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_USER, LightDMUserClass)) |
158 | |
159 | +#define LIGHTDM_USER_LIST_SIGNAL_USER_ADDED "user-added" |
160 | +#define LIGHTDM_USER_LIST_SIGNAL_USER_CHANGED "user-changed" |
161 | +#define LIGHTDM_USER_LIST_SIGNAL_USER_REMOVED "user-removed" |
162 | + |
163 | +#define LIGHTDM_SIGNAL_USER_CHANGED "changed" |
164 | + |
165 | typedef struct |
166 | { |
167 | GObject parent_instance; |
168 | |
169 | === modified file 'liblightdm-gobject/user.c' |
170 | --- liblightdm-gobject/user.c 2014-09-19 03:16:14 +0000 |
171 | +++ liblightdm-gobject/user.c 2014-09-29 23:49:17 +0000 |
172 | @@ -104,7 +104,7 @@ |
173 | wrap_common_user (CommonUser *user) |
174 | { |
175 | LightDMUser *lightdm_user = g_object_new (LIGHTDM_TYPE_USER, "common-user", user, NULL); |
176 | - g_signal_connect (user, "changed", G_CALLBACK (user_changed_cb), lightdm_user); |
177 | + g_signal_connect (user, USER_SIGNAL_CHANGED, G_CALLBACK (user_changed_cb), lightdm_user); |
178 | return lightdm_user; |
179 | } |
180 | |
181 | @@ -167,9 +167,9 @@ |
182 | priv->lightdm_list = g_list_reverse (priv->lightdm_list); |
183 | |
184 | CommonUserList *common_list = common_user_list_get_instance (); |
185 | - g_signal_connect (common_list, "user-added", G_CALLBACK (user_list_added_cb), user_list); |
186 | - g_signal_connect (common_list, "user-changed", G_CALLBACK (user_list_changed_cb), user_list); |
187 | - g_signal_connect (common_list, "user-removed", G_CALLBACK (user_list_removed_cb), user_list); |
188 | + g_signal_connect (common_list, USER_LIST_SIGNAL_USER_ADDED, G_CALLBACK (user_list_added_cb), user_list); |
189 | + g_signal_connect (common_list, USER_LIST_SIGNAL_USER_CHANGED, G_CALLBACK (user_list_changed_cb), user_list); |
190 | + g_signal_connect (common_list, USER_LIST_SIGNAL_USER_REMOVED, G_CALLBACK (user_list_removed_cb), user_list); |
191 | |
192 | priv->initialized = TRUE; |
193 | } |
194 | @@ -306,7 +306,7 @@ |
195 | * The ::user-added signal gets emitted when a user account is created. |
196 | **/ |
197 | list_signals[USER_ADDED] = |
198 | - g_signal_new ("user-added", |
199 | + g_signal_new (LIGHTDM_USER_LIST_SIGNAL_USER_ADDED, |
200 | G_TYPE_FROM_CLASS (klass), |
201 | G_SIGNAL_RUN_LAST, |
202 | G_STRUCT_OFFSET (LightDMUserListClass, user_added), |
203 | @@ -322,7 +322,7 @@ |
204 | * The ::user-changed signal gets emitted when a user account is modified. |
205 | **/ |
206 | list_signals[USER_CHANGED] = |
207 | - g_signal_new ("user-changed", |
208 | + g_signal_new (LIGHTDM_USER_LIST_SIGNAL_USER_CHANGED, |
209 | G_TYPE_FROM_CLASS (klass), |
210 | G_SIGNAL_RUN_LAST, |
211 | G_STRUCT_OFFSET (LightDMUserListClass, user_changed), |
212 | @@ -338,7 +338,7 @@ |
213 | * The ::user-removed signal gets emitted when a user account is removed. |
214 | **/ |
215 | list_signals[USER_REMOVED] = |
216 | - g_signal_new ("user-removed", |
217 | + g_signal_new (LIGHTDM_USER_LIST_SIGNAL_USER_REMOVED, |
218 | G_TYPE_FROM_CLASS (klass), |
219 | G_SIGNAL_RUN_LAST, |
220 | G_STRUCT_OFFSET (LightDMUserListClass, user_removed), |
221 | @@ -752,7 +752,7 @@ |
222 | * The ::changed signal gets emitted this user account is modified. |
223 | **/ |
224 | user_signals[CHANGED] = |
225 | - g_signal_new ("changed", |
226 | + g_signal_new (LIGHTDM_SIGNAL_USER_CHANGED, |
227 | G_TYPE_FROM_CLASS (klass), |
228 | G_SIGNAL_RUN_LAST, |
229 | G_STRUCT_OFFSET (LightDMUserClass, changed), |
230 | |
231 | === modified file 'liblightdm-qt/greeter.cpp' |
232 | --- liblightdm-qt/greeter.cpp 2014-09-19 03:16:14 +0000 |
233 | +++ liblightdm-qt/greeter.cpp 2014-09-29 23:49:17 +0000 |
234 | @@ -48,12 +48,12 @@ |
235 | #endif |
236 | ldmGreeter = lightdm_greeter_new(); |
237 | |
238 | - g_signal_connect (ldmGreeter, "show-prompt", G_CALLBACK (cb_showPrompt), this); |
239 | - g_signal_connect (ldmGreeter, "show-message", G_CALLBACK (cb_showMessage), this); |
240 | - g_signal_connect (ldmGreeter, "authentication-complete", G_CALLBACK (cb_authenticationComplete), this); |
241 | - g_signal_connect (ldmGreeter, "autologin-timer-expired", G_CALLBACK (cb_autoLoginExpired), this); |
242 | - g_signal_connect (ldmGreeter, "idle", G_CALLBACK (cb_idle), this); |
243 | - g_signal_connect (ldmGreeter, "reset", G_CALLBACK (cb_reset), this); |
244 | + g_signal_connect (ldmGreeter, LIGHTDM_GREETER_SIGNAL_SHOW_PROMPT, G_CALLBACK (cb_showPrompt), this); |
245 | + g_signal_connect (ldmGreeter, LIGHTDM_GREETER_SIGNAL_SHOW_MESSAGE, G_CALLBACK (cb_showMessage), this); |
246 | + g_signal_connect (ldmGreeter, LIGHTDM_GREETER_SIGNAL_AUTHENTICATION_COMPLETE, G_CALLBACK (cb_authenticationComplete), this); |
247 | + g_signal_connect (ldmGreeter, LIGHTDM_GREETER_SIGNAL_AUTOLOGIN_TIMER_EXPIRED, G_CALLBACK (cb_autoLoginExpired), this); |
248 | + g_signal_connect (ldmGreeter, LIGHTDM_GREETER_SIGNAL_IDLE, G_CALLBACK (cb_idle), this); |
249 | + g_signal_connect (ldmGreeter, LIGHTDM_GREETER_SIGNAL_RESET, G_CALLBACK (cb_reset), this); |
250 | } |
251 | |
252 | void GreeterPrivate::cb_showPrompt(LightDMGreeter *greeter, const gchar *text, LightDMPromptType type, gpointer data) |
253 | |
254 | === modified file 'liblightdm-qt/usersmodel.cpp' |
255 | --- liblightdm-qt/usersmodel.cpp 2014-05-09 10:37:13 +0000 |
256 | +++ liblightdm-qt/usersmodel.cpp 2014-09-29 23:49:17 +0000 |
257 | @@ -106,9 +106,9 @@ |
258 | |
259 | q->endInsertRows(); |
260 | } |
261 | - g_signal_connect(lightdm_user_list_get_instance(), "user-added", G_CALLBACK (cb_userAdded), this); |
262 | - g_signal_connect(lightdm_user_list_get_instance(), "user-changed", G_CALLBACK (cb_userChanged), this); |
263 | - g_signal_connect(lightdm_user_list_get_instance(), "user-removed", G_CALLBACK (cb_userRemoved), this); |
264 | + g_signal_connect(lightdm_user_list_get_instance(), LIGHTDM_USER_LIST_SIGNAL_USER_ADDED, G_CALLBACK (cb_userAdded), this); |
265 | + g_signal_connect(lightdm_user_list_get_instance(), LIGHTDM_USER_LIST_SIGNAL_USER_CHANGED, G_CALLBACK (cb_userChanged), this); |
266 | + g_signal_connect(lightdm_user_list_get_instance(), LIGHTDM_USER_LIST_SIGNAL_USER_REMOVED, G_CALLBACK (cb_userRemoved), this); |
267 | } |
268 | |
269 | void UsersModelPrivate::cb_userAdded(LightDMUserList *user_list, LightDMUser *ldmUser, gpointer data) |
270 | |
271 | === modified file 'src/display-manager.c' |
272 | --- src/display-manager.c 2014-09-19 03:16:14 +0000 |
273 | +++ src/display-manager.c 2014-09-29 23:49:17 +0000 |
274 | @@ -111,7 +111,7 @@ |
275 | return FALSE; |
276 | |
277 | manager->priv->seats = g_list_append (manager->priv->seats, g_object_ref (seat)); |
278 | - g_signal_connect (seat, "stopped", G_CALLBACK (seat_stopped_cb), manager); |
279 | + g_signal_connect (seat, SEAT_SIGNAL_STOPPED, G_CALLBACK (seat_stopped_cb), manager); |
280 | g_signal_emit (manager, signals[SEAT_ADDED], 0, seat); |
281 | |
282 | return TRUE; |
283 | @@ -195,7 +195,7 @@ |
284 | g_type_class_add_private (klass, sizeof (DisplayManagerPrivate)); |
285 | |
286 | signals[SEAT_ADDED] = |
287 | - g_signal_new ("seat-added", |
288 | + g_signal_new (DISPLAY_MANAGER_SIGNAL_SEAT_ADDED, |
289 | G_TYPE_FROM_CLASS (klass), |
290 | G_SIGNAL_RUN_LAST, |
291 | G_STRUCT_OFFSET (DisplayManagerClass, seat_added), |
292 | @@ -203,7 +203,7 @@ |
293 | NULL, |
294 | G_TYPE_NONE, 1, SEAT_TYPE); |
295 | signals[SEAT_REMOVED] = |
296 | - g_signal_new ("seat-removed", |
297 | + g_signal_new (DISPLAY_MANAGER_SIGNAL_SEAT_REMOVED, |
298 | G_TYPE_FROM_CLASS (klass), |
299 | G_SIGNAL_RUN_LAST, |
300 | G_STRUCT_OFFSET (DisplayManagerClass, seat_removed), |
301 | @@ -211,7 +211,7 @@ |
302 | NULL, |
303 | G_TYPE_NONE, 1, SEAT_TYPE); |
304 | signals[STOPPED] = |
305 | - g_signal_new ("stopped", |
306 | + g_signal_new (DISPLAY_MANAGER_SIGNAL_STOPPED, |
307 | G_TYPE_FROM_CLASS (klass), |
308 | G_SIGNAL_RUN_LAST, |
309 | G_STRUCT_OFFSET (DisplayManagerClass, stopped), |
310 | |
311 | === modified file 'src/display-manager.h' |
312 | --- src/display-manager.h 2014-09-19 03:16:14 +0000 |
313 | +++ src/display-manager.h 2014-09-29 23:49:17 +0000 |
314 | @@ -21,6 +21,10 @@ |
315 | #define DISPLAY_MANAGER_TYPE (display_manager_get_type()) |
316 | #define DISPLAY_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DISPLAY_MANAGER_TYPE, DisplayManager)); |
317 | |
318 | +#define DISPLAY_MANAGER_SIGNAL_SEAT_ADDED "seat-added" |
319 | +#define DISPLAY_MANAGER_SIGNAL_SEAT_REMOVED "seat-removed" |
320 | +#define DISPLAY_MANAGER_SIGNAL_STOPPED "stopped" |
321 | + |
322 | typedef struct DisplayManagerPrivate DisplayManagerPrivate; |
323 | |
324 | typedef struct |
325 | |
326 | === modified file 'src/display-server.c' |
327 | --- src/display-server.c 2014-09-19 03:16:14 +0000 |
328 | +++ src/display-server.c 2014-09-29 23:49:17 +0000 |
329 | @@ -179,7 +179,7 @@ |
330 | g_type_class_add_private (klass, sizeof (DisplayServerPrivate)); |
331 | |
332 | signals[READY] = |
333 | - g_signal_new ("ready", |
334 | + g_signal_new (DISPLAY_SERVER_SIGNAL_READY, |
335 | G_TYPE_FROM_CLASS (klass), |
336 | G_SIGNAL_RUN_LAST, |
337 | G_STRUCT_OFFSET (DisplayServerClass, ready), |
338 | @@ -187,7 +187,7 @@ |
339 | NULL, |
340 | G_TYPE_NONE, 0); |
341 | signals[STOPPED] = |
342 | - g_signal_new ("stopped", |
343 | + g_signal_new (DISPLAY_SERVER_SIGNAL_STOPPED, |
344 | G_TYPE_FROM_CLASS (klass), |
345 | G_SIGNAL_RUN_LAST, |
346 | G_STRUCT_OFFSET (DisplayServerClass, stopped), |
347 | |
348 | === modified file 'src/display-server.h' |
349 | --- src/display-server.h 2014-09-19 03:16:14 +0000 |
350 | +++ src/display-server.h 2014-09-29 23:49:17 +0000 |
351 | @@ -26,6 +26,9 @@ |
352 | #define DISPLAY_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DISPLAY_SERVER_TYPE, DisplayServerClass)) |
353 | #define DISPLAY_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DISPLAY_SERVER_TYPE, DisplayServerClass)) |
354 | |
355 | +#define DISPLAY_SERVER_SIGNAL_READY "ready" |
356 | +#define DISPLAY_SERVER_SIGNAL_STOPPED "stopped" |
357 | + |
358 | typedef struct DisplayServerPrivate DisplayServerPrivate; |
359 | |
360 | struct DisplayServer |
361 | |
362 | === modified file 'src/greeter.c' |
363 | --- src/greeter.c 2014-09-19 03:16:14 +0000 |
364 | +++ src/greeter.c 2014-09-29 23:49:17 +0000 |
365 | @@ -436,7 +436,7 @@ |
366 | if (greeter->priv->active_username) |
367 | g_free (greeter->priv->active_username); |
368 | greeter->priv->active_username = g_strdup (username); |
369 | - g_object_notify (G_OBJECT (greeter), "active-username"); |
370 | + g_object_notify (G_OBJECT (greeter), GREETER_PROPERTY_ACTIVE_USERNAME); |
371 | |
372 | greeter->priv->authentication_sequence_number = sequence_number; |
373 | g_signal_emit (greeter, signals[CREATE_SESSION], 0, &greeter->priv->authentication_session); |
374 | @@ -446,8 +446,8 @@ |
375 | return; |
376 | } |
377 | |
378 | - g_signal_connect (G_OBJECT (greeter->priv->authentication_session), "got-messages", G_CALLBACK (pam_messages_cb), greeter); |
379 | - g_signal_connect (G_OBJECT (greeter->priv->authentication_session), "authentication-complete", G_CALLBACK (authentication_complete_cb), greeter); |
380 | + g_signal_connect (G_OBJECT (greeter->priv->authentication_session), SESSION_SIGNAL_GOT_MESSAGES, G_CALLBACK (pam_messages_cb), greeter); |
381 | + g_signal_connect (G_OBJECT (greeter->priv->authentication_session), SESSION_SIGNAL_AUTHENTICATION_COMPLETE, G_CALLBACK (authentication_complete_cb), greeter); |
382 | |
383 | /* Use non-interactive service for autologin user */ |
384 | autologin_username = g_hash_table_lookup (greeter->priv->hints, "autologin-user"); |
385 | @@ -550,8 +550,8 @@ |
386 | g_signal_emit (greeter, signals[CREATE_SESSION], 0, &greeter->priv->authentication_session); |
387 | if (greeter->priv->authentication_session) |
388 | { |
389 | - g_signal_connect (G_OBJECT (greeter->priv->authentication_session), "got-messages", G_CALLBACK (pam_messages_cb), greeter); |
390 | - g_signal_connect (G_OBJECT (greeter->priv->authentication_session), "authentication-complete", G_CALLBACK (authentication_complete_cb), greeter); |
391 | + g_signal_connect (G_OBJECT (greeter->priv->authentication_session), SESSION_SIGNAL_GOT_MESSAGES, G_CALLBACK (pam_messages_cb), greeter); |
392 | + g_signal_connect (G_OBJECT (greeter->priv->authentication_session), SESSION_SIGNAL_AUTHENTICATION_COMPLETE, G_CALLBACK (authentication_complete_cb), greeter); |
393 | |
394 | /* Run the session process */ |
395 | session_set_pam_service (greeter->priv->authentication_session, service); |
396 | @@ -1101,7 +1101,7 @@ |
397 | object_class->set_property = greeter_set_property; |
398 | |
399 | signals[CONNECTED] = |
400 | - g_signal_new ("connected", |
401 | + g_signal_new (GREETER_SIGNAL_CONNECTED, |
402 | G_TYPE_FROM_CLASS (klass), |
403 | G_SIGNAL_RUN_LAST, |
404 | G_STRUCT_OFFSET (GreeterClass, connected), |
405 | @@ -1110,7 +1110,7 @@ |
406 | G_TYPE_NONE, 0); |
407 | |
408 | signals[CREATE_SESSION] = |
409 | - g_signal_new ("create-session", |
410 | + g_signal_new (GREETER_SIGNAL_CREATE_SESSION, |
411 | G_TYPE_FROM_CLASS (klass), |
412 | G_SIGNAL_RUN_LAST, |
413 | G_STRUCT_OFFSET (GreeterClass, create_session), |
414 | @@ -1120,7 +1120,7 @@ |
415 | SESSION_TYPE, 0); |
416 | |
417 | signals[START_SESSION] = |
418 | - g_signal_new ("start-session", |
419 | + g_signal_new (GREETER_SIGNAL_START_SESSION, |
420 | G_TYPE_FROM_CLASS (klass), |
421 | G_SIGNAL_RUN_LAST, |
422 | G_STRUCT_OFFSET (GreeterClass, start_session), |
423 | @@ -1131,8 +1131,8 @@ |
424 | |
425 | g_object_class_install_property (object_class, |
426 | PROP_ACTIVE_USERNAME, |
427 | - g_param_spec_string ("active-username", |
428 | - "active-username", |
429 | + g_param_spec_string (GREETER_PROPERTY_ACTIVE_USERNAME, |
430 | + GREETER_PROPERTY_ACTIVE_USERNAME, |
431 | "Active username", |
432 | NULL, |
433 | G_PARAM_READABLE)); |
434 | |
435 | === modified file 'src/greeter.h' |
436 | --- src/greeter.h 2014-09-19 03:16:14 +0000 |
437 | +++ src/greeter.h 2014-09-29 23:49:17 +0000 |
438 | @@ -22,6 +22,14 @@ |
439 | #define GREETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GREETER_TYPE, GreeterClass)) |
440 | #define IS_GREETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GREETER_TYPE)) |
441 | |
442 | +#define GREETER_SIGNAL_CONNECTED "connected" |
443 | +#define GREETER_SIGNAL_CREATE_SESSION "create-session" |
444 | +#define GREETER_SIGNAL_START_SESSION "start-session" |
445 | + |
446 | +#define GREETER_PROPERTY_ACTIVE_USERNAME "active-username" |
447 | + |
448 | +#define GREETER_SIGNAL_ACTIVE_USERNAME_CHANGED "notify::" GREETER_PROPERTY_ACTIVE_USERNAME |
449 | + |
450 | typedef struct GreeterPrivate GreeterPrivate; |
451 | |
452 | typedef struct |
453 | |
454 | === modified file 'src/lightdm.c' |
455 | --- src/lightdm.c 2014-09-19 03:16:14 +0000 |
456 | +++ src/lightdm.c 2014-09-29 23:49:17 +0000 |
457 | @@ -705,8 +705,8 @@ |
458 | emit_object_value_changed (bus, "/org/freedesktop/DisplayManager", "org.freedesktop.DisplayManager", "Seats", get_seat_list ()); |
459 | emit_object_signal (bus, "/org/freedesktop/DisplayManager", "SeatAdded", entry->path); |
460 | |
461 | - g_signal_connect (seat, "running-user-session", G_CALLBACK (running_user_session_cb), NULL); |
462 | - g_signal_connect (seat, "session-removed", G_CALLBACK (session_removed_cb), NULL); |
463 | + g_signal_connect (seat, SEAT_SIGNAL_RUNNING_USER_SESSION, G_CALLBACK (running_user_session_cb), NULL); |
464 | + g_signal_connect (seat, SEAT_SIGNAL_SESSION_REMOVED, G_CALLBACK (session_removed_cb), NULL); |
465 | } |
466 | |
467 | static void |
468 | @@ -838,8 +838,8 @@ |
469 | seat_bus_entries = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, seat_bus_entry_free); |
470 | session_bus_entries = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, session_bus_entry_free); |
471 | |
472 | - g_signal_connect (display_manager, "seat-added", G_CALLBACK (seat_added_cb), NULL); |
473 | - g_signal_connect (display_manager, "seat-removed", G_CALLBACK (seat_removed_cb), NULL); |
474 | + g_signal_connect (display_manager, DISPLAY_MANAGER_SIGNAL_SEAT_ADDED, G_CALLBACK (seat_added_cb), NULL); |
475 | + g_signal_connect (display_manager, DISPLAY_MANAGER_SIGNAL_SEAT_REMOVED, G_CALLBACK (seat_removed_cb), NULL); |
476 | for (link = display_manager_get_seats (display_manager); link; link = link->next) |
477 | seat_added_cb (display_manager, (Seat *) link->data); |
478 | |
479 | @@ -858,7 +858,7 @@ |
480 | if (port > 0) |
481 | xdmcp_server_set_port (xdmcp_server, port); |
482 | } |
483 | - g_signal_connect (xdmcp_server, "new-session", G_CALLBACK (xdmcp_session_cb), NULL); |
484 | + g_signal_connect (xdmcp_server, XDMCP_SERVER_SIGNAL_NEW_SESSION, G_CALLBACK (xdmcp_session_cb), NULL); |
485 | |
486 | key_name = config_get_string (config_get_instance (), "XDMCPServer", "key"); |
487 | if (key_name) |
488 | @@ -911,7 +911,7 @@ |
489 | if (port > 0) |
490 | vnc_server_set_port (vnc_server, port); |
491 | } |
492 | - g_signal_connect (vnc_server, "new-connection", G_CALLBACK (vnc_connection_cb), NULL); |
493 | + g_signal_connect (vnc_server, VNC_SERVER_SIGNAL_NEW_CONNECTION, G_CALLBACK (vnc_connection_cb), NULL); |
494 | |
495 | g_debug ("Starting VNC server on TCP/IP port %d", vnc_server_get_port (vnc_server)); |
496 | vnc_server_start (vnc_server); |
497 | @@ -1035,7 +1035,7 @@ |
498 | if (seat) |
499 | { |
500 | if (seat_get_is_stopping (seat)) |
501 | - g_signal_connect (seat, "stopped", G_CALLBACK (seat_stopped_cb), login1_seat); |
502 | + g_signal_connect (seat, SEAT_SIGNAL_STOPPED, G_CALLBACK (seat_stopped_cb), login1_seat); |
503 | return TRUE; |
504 | } |
505 | |
506 | @@ -1064,7 +1064,7 @@ |
507 | g_debug ("Seat %s added from logind without graphical output", login1_seat_get_id (login1_seat)); |
508 | |
509 | if (config_get_boolean (config_get_instance (), "LightDM", "logind-check-graphical")) |
510 | - g_signal_connect (login1_seat, "can-graphical-changed", G_CALLBACK (login1_can_graphical_changed_cb), NULL); |
511 | + g_signal_connect (login1_seat, LOGIN1_SEAT_SIGNAL_CAN_GRAPHICAL_CHANGED, G_CALLBACK (login1_can_graphical_changed_cb), NULL); |
512 | update_login1_seat (login1_seat); |
513 | } |
514 | |
515 | @@ -1137,7 +1137,7 @@ |
516 | |
517 | messages = g_list_append (messages, g_strdup_printf ("Starting Light Display Manager %s, UID=%i PID=%i", VERSION, getuid (), getpid ())); |
518 | |
519 | - g_signal_connect (process_get_current (), "got-signal", G_CALLBACK (signal_cb), NULL); |
520 | + g_signal_connect (process_get_current (), PROCESS_SIGNAL_GOT_SIGNAL, G_CALLBACK (signal_cb), NULL); |
521 | |
522 | option_context = g_option_context_new (/* Arguments and description for --help test */ |
523 | _("- Display Manager")); |
524 | @@ -1401,8 +1401,8 @@ |
525 | g_debug ("Using Xephyr for X servers"); |
526 | |
527 | display_manager = display_manager_new (); |
528 | - g_signal_connect (display_manager, "stopped", G_CALLBACK (display_manager_stopped_cb), NULL); |
529 | - g_signal_connect (display_manager, "seat-removed", G_CALLBACK (display_manager_seat_removed_cb), NULL); |
530 | + g_signal_connect (display_manager, DISPLAY_MANAGER_SIGNAL_STOPPED, G_CALLBACK (display_manager_stopped_cb), NULL); |
531 | + g_signal_connect (display_manager, DISPLAY_MANAGER_SIGNAL_SEAT_REMOVED, G_CALLBACK (display_manager_seat_removed_cb), NULL); |
532 | |
533 | shared_data_manager_start (shared_data_manager_get_instance ()); |
534 | |
535 | @@ -1414,14 +1414,14 @@ |
536 | |
537 | if (config_get_boolean (config_get_instance (), "LightDM", "start-default-seat")) |
538 | { |
539 | - g_signal_connect (login1_service_get_instance (), "seat-added", G_CALLBACK (login1_service_seat_added_cb), NULL); |
540 | - g_signal_connect (login1_service_get_instance (), "seat-removed", G_CALLBACK (login1_service_seat_removed_cb), NULL); |
541 | + g_signal_connect (login1_service_get_instance (), LOGIN1_SERVICE_SIGNAL_SEAT_ADDED, G_CALLBACK (login1_service_seat_added_cb), NULL); |
542 | + g_signal_connect (login1_service_get_instance (), LOGIN1_SERVICE_SIGNAL_SEAT_REMOVED, G_CALLBACK (login1_service_seat_removed_cb), NULL); |
543 | |
544 | for (link = login1_service_get_seats (login1_service_get_instance ()); link; link = link->next) |
545 | { |
546 | Login1Seat *login1_seat = link->data; |
547 | if (config_get_boolean (config_get_instance (), "LightDM", "logind-check-graphical")) |
548 | - g_signal_connect (login1_seat, "can-graphical-changed", G_CALLBACK (login1_can_graphical_changed_cb), NULL); |
549 | + g_signal_connect (login1_seat, LOGIN1_SEAT_SIGNAL_CAN_GRAPHICAL_CHANGED, G_CALLBACK (login1_can_graphical_changed_cb), NULL); |
550 | if (!update_login1_seat (login1_seat)) |
551 | return EXIT_FAILURE; |
552 | } |
553 | |
554 | === modified file 'src/login1.c' |
555 | --- src/login1.c 2014-09-19 03:16:14 +0000 |
556 | +++ src/login1.c 2014-09-29 23:49:17 +0000 |
557 | @@ -451,7 +451,7 @@ |
558 | g_type_class_add_private (klass, sizeof (Login1ServicePrivate)); |
559 | |
560 | service_signals[SEAT_ADDED] = |
561 | - g_signal_new ("seat-added", |
562 | + g_signal_new (LOGIN1_SERVICE_SIGNAL_SEAT_ADDED, |
563 | G_TYPE_FROM_CLASS (klass), |
564 | G_SIGNAL_RUN_LAST, |
565 | G_STRUCT_OFFSET (Login1ServiceClass, seat_added), |
566 | @@ -459,7 +459,7 @@ |
567 | NULL, |
568 | G_TYPE_NONE, 1, LOGIN1_SEAT_TYPE); |
569 | service_signals[SEAT_REMOVED] = |
570 | - g_signal_new ("seat-removed", |
571 | + g_signal_new (LOGIN1_SERVICE_SIGNAL_SEAT_REMOVED, |
572 | G_TYPE_FROM_CLASS (klass), |
573 | G_SIGNAL_RUN_LAST, |
574 | G_STRUCT_OFFSET (Login1ServiceClass, seat_removed), |
575 | @@ -518,7 +518,7 @@ |
576 | g_type_class_add_private (klass, sizeof (Login1SeatPrivate)); |
577 | |
578 | seat_signals[CAN_GRAPHICAL_CHANGED] = |
579 | - g_signal_new ("can-graphical-changed", |
580 | + g_signal_new (LOGIN1_SEAT_SIGNAL_CAN_GRAPHICAL_CHANGED, |
581 | G_TYPE_FROM_CLASS (klass), |
582 | G_SIGNAL_RUN_LAST, |
583 | G_STRUCT_OFFSET (Login1SeatClass, can_graphical_changed), |
584 | |
585 | === modified file 'src/login1.h' |
586 | --- src/login1.h 2014-09-19 03:16:14 +0000 |
587 | +++ src/login1.h 2014-09-29 23:49:17 +0000 |
588 | @@ -22,6 +22,11 @@ |
589 | #define LOGIN1_SERVICE_TYPE (login1_service_get_type()) |
590 | #define LOGIN1_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LOGIN1_SERVICE_TYPE, Login1Service)); |
591 | |
592 | +#define LOGIN1_SERVICE_SIGNAL_SEAT_ADDED "seat-added" |
593 | +#define LOGIN1_SERVICE_SIGNAL_SEAT_REMOVED "seat-removed" |
594 | + |
595 | +#define LOGIN1_SEAT_SIGNAL_CAN_GRAPHICAL_CHANGED "can-graphical-changed" |
596 | + |
597 | typedef struct Login1SeatPrivate Login1SeatPrivate; |
598 | |
599 | typedef struct |
600 | |
601 | === modified file 'src/process.c' |
602 | --- src/process.c 2014-09-19 03:16:14 +0000 |
603 | +++ src/process.c 2014-09-29 23:49:17 +0000 |
604 | @@ -432,7 +432,7 @@ |
605 | g_type_class_add_private (klass, sizeof (ProcessPrivate)); |
606 | |
607 | signals[GOT_DATA] = |
608 | - g_signal_new ("got-data", |
609 | + g_signal_new (PROCESS_SIGNAL_GOT_DATA, |
610 | G_TYPE_FROM_CLASS (klass), |
611 | G_SIGNAL_RUN_LAST, |
612 | G_STRUCT_OFFSET (ProcessClass, got_data), |
613 | @@ -440,7 +440,7 @@ |
614 | NULL, |
615 | G_TYPE_NONE, 0); |
616 | signals[GOT_SIGNAL] = |
617 | - g_signal_new ("got-signal", |
618 | + g_signal_new (PROCESS_SIGNAL_GOT_SIGNAL, |
619 | G_TYPE_FROM_CLASS (klass), |
620 | G_SIGNAL_RUN_LAST, |
621 | G_STRUCT_OFFSET (ProcessClass, got_signal), |
622 | @@ -448,7 +448,7 @@ |
623 | NULL, |
624 | G_TYPE_NONE, 1, G_TYPE_INT); |
625 | signals[STOPPED] = |
626 | - g_signal_new ("stopped", |
627 | + g_signal_new (PROCESS_SIGNAL_STOPPED, |
628 | G_TYPE_FROM_CLASS (klass), |
629 | G_SIGNAL_RUN_LAST, |
630 | G_STRUCT_OFFSET (ProcessClass, stopped), |
631 | |
632 | === modified file 'src/process.h' |
633 | --- src/process.h 2014-09-19 03:16:14 +0000 |
634 | +++ src/process.h 2014-09-29 23:49:17 +0000 |
635 | @@ -21,6 +21,10 @@ |
636 | #define PROCESS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PROCESS_TYPE, Process)) |
637 | #define PROCESS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PROCESS_TYPE, ProcessClass)) |
638 | |
639 | +#define PROCESS_SIGNAL_GOT_DATA "got-data" |
640 | +#define PROCESS_SIGNAL_GOT_SIGNAL "got-signal" |
641 | +#define PROCESS_SIGNAL_STOPPED "stopped" |
642 | + |
643 | typedef struct ProcessPrivate ProcessPrivate; |
644 | |
645 | typedef struct |
646 | |
647 | === modified file 'src/seat-unity.c' |
648 | --- src/seat-unity.c 2014-09-19 03:16:14 +0000 |
649 | +++ src/seat-unity.c 2014-09-29 23:49:17 +0000 |
650 | @@ -127,7 +127,7 @@ |
651 | g_key_file_free (keys); |
652 | } |
653 | |
654 | - g_signal_connect (seat->priv->xdmcp_x_server, "stopped", G_CALLBACK (xdmcp_x_server_stopped_cb), seat); |
655 | + g_signal_connect (seat->priv->xdmcp_x_server, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (xdmcp_x_server_stopped_cb), seat); |
656 | if (!display_server_start (DISPLAY_SERVER (seat->priv->xdmcp_x_server))) |
657 | seat_stop (SEAT (seat)); |
658 | } |
659 | @@ -182,8 +182,8 @@ |
660 | timeout = 60; |
661 | |
662 | SEAT_UNITY (seat)->priv->compositor = unity_system_compositor_new (); |
663 | - g_signal_connect (SEAT_UNITY (seat)->priv->compositor, "ready", G_CALLBACK (compositor_ready_cb), seat); |
664 | - g_signal_connect (SEAT_UNITY (seat)->priv->compositor, "stopped", G_CALLBACK (compositor_stopped_cb), seat); |
665 | + g_signal_connect (SEAT_UNITY (seat)->priv->compositor, DISPLAY_SERVER_SIGNAL_READY, G_CALLBACK (compositor_ready_cb), seat); |
666 | + g_signal_connect (SEAT_UNITY (seat)->priv->compositor, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (compositor_stopped_cb), seat); |
667 | unity_system_compositor_set_command (SEAT_UNITY (seat)->priv->compositor, seat_get_string_property (SEAT (seat), "unity-compositor-command")); |
668 | unity_system_compositor_set_vt (SEAT_UNITY (seat)->priv->compositor, vt); |
669 | unity_system_compositor_set_timeout (SEAT_UNITY (seat)->priv->compositor, timeout); |
670 | |
671 | === modified file 'src/seat-xlocal.c' |
672 | --- src/seat-xlocal.c 2014-09-19 03:16:14 +0000 |
673 | +++ src/seat-xlocal.c 2014-09-29 23:49:17 +0000 |
674 | @@ -110,7 +110,7 @@ |
675 | g_key_file_free (keys); |
676 | } |
677 | |
678 | - g_signal_connect (s->priv->xdmcp_x_server, "stopped", G_CALLBACK (xdmcp_x_server_stopped_cb), seat); |
679 | + g_signal_connect (s->priv->xdmcp_x_server, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (xdmcp_x_server_stopped_cb), seat); |
680 | return display_server_start (DISPLAY_SERVER (s->priv->xdmcp_x_server)); |
681 | } |
682 | |
683 | @@ -150,8 +150,8 @@ |
684 | if (active_vt >= vt_get_min ()) |
685 | { |
686 | vt = active_vt; |
687 | - g_signal_connect (display_server, "ready", G_CALLBACK (display_server_ready_cb), seat); |
688 | - g_signal_connect (display_server, "stopped", G_CALLBACK (display_server_transition_plymouth_cb), seat); |
689 | + g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_READY, G_CALLBACK (display_server_ready_cb), seat); |
690 | + g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (display_server_transition_plymouth_cb), seat); |
691 | plymouth_deactivate (); |
692 | } |
693 | else |
694 | |
695 | === modified file 'src/seat.c' |
696 | --- src/seat.c 2014-09-19 03:16:14 +0000 |
697 | +++ src/seat.c 2014-09-29 23:49:17 +0000 |
698 | @@ -851,8 +851,8 @@ |
699 | session = SEAT_GET_CLASS (seat)->create_session (seat); |
700 | seat->priv->sessions = g_list_append (seat->priv->sessions, session); |
701 | if (autostart) |
702 | - g_signal_connect (session, "authentication-complete", G_CALLBACK (session_authentication_complete_cb), seat); |
703 | - g_signal_connect (session, "stopped", G_CALLBACK (session_stopped_cb), seat); |
704 | + g_signal_connect (session, SESSION_SIGNAL_AUTHENTICATION_COMPLETE, G_CALLBACK (session_authentication_complete_cb), seat); |
705 | + g_signal_connect (session, SESSION_SIGNAL_STOPPED, G_CALLBACK (session_stopped_cb), seat); |
706 | |
707 | set_session_env (session); |
708 | |
709 | @@ -1212,9 +1212,9 @@ |
710 | greeter_session = SEAT_GET_CLASS (seat)->create_greeter_session (seat); |
711 | session_set_config (SESSION (greeter_session), session_config); |
712 | seat->priv->sessions = g_list_append (seat->priv->sessions, SESSION (greeter_session)); |
713 | - g_signal_connect (greeter_session, "notify::active-username", G_CALLBACK (greeter_active_username_changed_cb), seat); |
714 | - g_signal_connect (greeter_session, "authentication-complete", G_CALLBACK (session_authentication_complete_cb), seat); |
715 | - g_signal_connect (greeter_session, "stopped", G_CALLBACK (session_stopped_cb), seat); |
716 | + g_signal_connect (greeter_session, GREETER_SIGNAL_ACTIVE_USERNAME_CHANGED, G_CALLBACK (greeter_active_username_changed_cb), seat); |
717 | + g_signal_connect (greeter_session, SESSION_SIGNAL_AUTHENTICATION_COMPLETE, G_CALLBACK (session_authentication_complete_cb), seat); |
718 | + g_signal_connect (greeter_session, SESSION_SIGNAL_STOPPED, G_CALLBACK (session_stopped_cb), seat); |
719 | |
720 | set_session_env (SESSION (greeter_session)); |
721 | session_set_env (SESSION (greeter_session), "XDG_SESSION_CLASS", "greeter"); |
722 | @@ -1238,8 +1238,8 @@ |
723 | greeter_set_pam_services (greeter_session, |
724 | seat_get_string_property (seat, "pam-service"), |
725 | seat_get_string_property (seat, "pam-autologin-service")); |
726 | - g_signal_connect (greeter_session, "create-session", G_CALLBACK (greeter_create_session_cb), seat); |
727 | - g_signal_connect (greeter_session, "start-session", G_CALLBACK (greeter_start_session_cb), seat); |
728 | + g_signal_connect (greeter_session, GREETER_SIGNAL_CREATE_SESSION, G_CALLBACK (greeter_create_session_cb), seat); |
729 | + g_signal_connect (greeter_session, GREETER_SIGNAL_START_SESSION, G_CALLBACK (greeter_start_session_cb), seat); |
730 | |
731 | /* Set hints to greeter */ |
732 | greeter_set_allow_guest (greeter_session, seat_get_allow_guest (seat)); |
733 | @@ -1335,8 +1335,8 @@ |
734 | return NULL; |
735 | |
736 | seat->priv->display_servers = g_list_append (seat->priv->display_servers, display_server); |
737 | - g_signal_connect (display_server, "ready", G_CALLBACK (display_server_ready_cb), seat); |
738 | - g_signal_connect (display_server, "stopped", G_CALLBACK (display_server_stopped_cb), seat); |
739 | + g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_READY, G_CALLBACK (display_server_ready_cb), seat); |
740 | + g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (display_server_stopped_cb), seat); |
741 | |
742 | return display_server; |
743 | } |
744 | @@ -1467,7 +1467,7 @@ |
745 | |
746 | /* Attempt to authenticate them */ |
747 | session = create_user_session (seat, username, FALSE); |
748 | - g_signal_connect (session, "authentication-complete", G_CALLBACK (switch_authentication_complete_cb), seat); |
749 | + g_signal_connect (session, SESSION_SIGNAL_AUTHENTICATION_COMPLETE, G_CALLBACK (switch_authentication_complete_cb), seat); |
750 | session_set_pam_service (session, seat_get_string_property (seat, "pam-service")); |
751 | |
752 | return session_start (session); |
753 | @@ -1834,7 +1834,7 @@ |
754 | g_type_class_add_private (klass, sizeof (SeatPrivate)); |
755 | |
756 | signals[SESSION_ADDED] = |
757 | - g_signal_new ("session-added", |
758 | + g_signal_new (SEAT_SIGNAL_SESSION_ADDED, |
759 | G_TYPE_FROM_CLASS (klass), |
760 | G_SIGNAL_RUN_LAST, |
761 | G_STRUCT_OFFSET (SeatClass, session_added), |
762 | @@ -1842,7 +1842,7 @@ |
763 | NULL, |
764 | G_TYPE_NONE, 1, SESSION_TYPE); |
765 | signals[RUNNING_USER_SESSION] = |
766 | - g_signal_new ("running-user-session", |
767 | + g_signal_new (SEAT_SIGNAL_RUNNING_USER_SESSION, |
768 | G_TYPE_FROM_CLASS (klass), |
769 | G_SIGNAL_RUN_LAST, |
770 | G_STRUCT_OFFSET (SeatClass, running_user_session), |
771 | @@ -1850,7 +1850,7 @@ |
772 | NULL, |
773 | G_TYPE_NONE, 1, SESSION_TYPE); |
774 | signals[SESSION_REMOVED] = |
775 | - g_signal_new ("session-removed", |
776 | + g_signal_new (SEAT_SIGNAL_SESSION_REMOVED, |
777 | G_TYPE_FROM_CLASS (klass), |
778 | G_SIGNAL_RUN_LAST, |
779 | G_STRUCT_OFFSET (SeatClass, session_removed), |
780 | @@ -1858,7 +1858,7 @@ |
781 | NULL, |
782 | G_TYPE_NONE, 1, SESSION_TYPE); |
783 | signals[STOPPED] = |
784 | - g_signal_new ("stopped", |
785 | + g_signal_new (SEAT_SIGNAL_STOPPED, |
786 | G_TYPE_FROM_CLASS (klass), |
787 | G_SIGNAL_RUN_LAST, |
788 | G_STRUCT_OFFSET (SeatClass, stopped), |
789 | |
790 | === modified file 'src/seat.h' |
791 | --- src/seat.h 2014-09-19 03:16:14 +0000 |
792 | +++ src/seat.h 2014-09-29 23:49:17 +0000 |
793 | @@ -26,6 +26,11 @@ |
794 | #define SEAT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAT_TYPE, SeatClass)) |
795 | #define SEAT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAT_TYPE, SeatClass)) |
796 | |
797 | +#define SEAT_SIGNAL_SESSION_ADDED "session-added" |
798 | +#define SEAT_SIGNAL_RUNNING_USER_SESSION "running-user-session" |
799 | +#define SEAT_SIGNAL_SESSION_REMOVED "session-removed" |
800 | +#define SEAT_SIGNAL_STOPPED "stopped" |
801 | + |
802 | typedef struct SeatPrivate SeatPrivate; |
803 | |
804 | typedef struct |
805 | |
806 | === modified file 'src/session.c' |
807 | --- src/session.c 2014-09-23 01:24:48 +0000 |
808 | +++ src/session.c 2014-09-29 23:49:17 +0000 |
809 | @@ -958,7 +958,7 @@ |
810 | g_type_class_add_private (klass, sizeof (SessionPrivate)); |
811 | |
812 | signals[GOT_MESSAGES] = |
813 | - g_signal_new ("got-messages", |
814 | + g_signal_new (SESSION_SIGNAL_GOT_MESSAGES, |
815 | G_TYPE_FROM_CLASS (klass), |
816 | G_SIGNAL_RUN_LAST, |
817 | G_STRUCT_OFFSET (SessionClass, got_messages), |
818 | @@ -967,7 +967,7 @@ |
819 | G_TYPE_NONE, 0); |
820 | |
821 | signals[AUTHENTICATION_COMPLETE] = |
822 | - g_signal_new ("authentication-complete", |
823 | + g_signal_new (SESSION_SIGNAL_AUTHENTICATION_COMPLETE, |
824 | G_TYPE_FROM_CLASS (klass), |
825 | G_SIGNAL_RUN_LAST, |
826 | G_STRUCT_OFFSET (SessionClass, authentication_complete), |
827 | @@ -976,7 +976,7 @@ |
828 | G_TYPE_NONE, 0); |
829 | |
830 | signals[STOPPED] = |
831 | - g_signal_new ("stopped", |
832 | + g_signal_new (SESSION_SIGNAL_STOPPED, |
833 | G_TYPE_FROM_CLASS (klass), |
834 | G_SIGNAL_RUN_LAST, |
835 | G_STRUCT_OFFSET (SessionClass, stopped), |
836 | |
837 | === modified file 'src/session.h' |
838 | --- src/session.h 2014-09-19 03:16:14 +0000 |
839 | +++ src/session.h 2014-09-29 23:49:17 +0000 |
840 | @@ -31,6 +31,10 @@ |
841 | #define SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SESSION_TYPE, SessionClass)) |
842 | #define SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SESSION_TYPE, SessionClass)) |
843 | |
844 | +#define SESSION_SIGNAL_GOT_MESSAGES "got-messages" |
845 | +#define SESSION_SIGNAL_AUTHENTICATION_COMPLETE "authentication-complete" |
846 | +#define SESSION_SIGNAL_STOPPED "stopped" |
847 | + |
848 | typedef struct SessionPrivate SessionPrivate; |
849 | |
850 | struct Session |
851 | |
852 | === modified file 'src/shared-data-manager.c' |
853 | --- src/shared-data-manager.c 2014-09-19 03:16:14 +0000 |
854 | +++ src/shared-data-manager.c 2014-09-29 23:49:17 +0000 |
855 | @@ -227,7 +227,7 @@ |
856 | g_object_unref (file); |
857 | |
858 | /* And listen for user removals. */ |
859 | - g_signal_connect (common_user_list_get_instance (), "user-removed", G_CALLBACK (user_removed_cb), manager); |
860 | + g_signal_connect (common_user_list_get_instance (), USER_LIST_SIGNAL_USER_REMOVED, G_CALLBACK (user_removed_cb), manager); |
861 | } |
862 | |
863 | static void |
864 | |
865 | === modified file 'src/unity-system-compositor.c' |
866 | --- src/unity-system-compositor.c 2014-09-19 03:16:14 +0000 |
867 | +++ src/unity-system-compositor.c 2014-09-29 23:49:17 +0000 |
868 | @@ -438,7 +438,7 @@ |
869 | g_string_free (command, TRUE); |
870 | |
871 | /* Start the compositor */ |
872 | - g_signal_connect (compositor->priv->process, "stopped", G_CALLBACK (stopped_cb), compositor); |
873 | + g_signal_connect (compositor->priv->process, PROCESS_SIGNAL_STOPPED, G_CALLBACK (stopped_cb), compositor); |
874 | result = process_start (compositor->priv->process, FALSE); |
875 | |
876 | /* Close compostor ends of the pipes */ |
877 | |
878 | === modified file 'src/vnc-server.c' |
879 | --- src/vnc-server.c 2014-09-19 03:16:14 +0000 |
880 | +++ src/vnc-server.c 2014-09-29 23:49:17 +0000 |
881 | @@ -168,7 +168,7 @@ |
882 | g_type_class_add_private (klass, sizeof (VNCServerPrivate)); |
883 | |
884 | signals[NEW_CONNECTION] = |
885 | - g_signal_new ("new-connection", |
886 | + g_signal_new (VNC_SERVER_SIGNAL_NEW_CONNECTION, |
887 | G_TYPE_FROM_CLASS (klass), |
888 | G_SIGNAL_RUN_LAST, |
889 | G_STRUCT_OFFSET (VNCServerClass, new_connection), |
890 | |
891 | === modified file 'src/vnc-server.h' |
892 | --- src/vnc-server.h 2014-09-19 03:16:14 +0000 |
893 | +++ src/vnc-server.h 2014-09-29 23:49:17 +0000 |
894 | @@ -19,6 +19,8 @@ |
895 | #define VNC_SERVER_TYPE (vnc_server_get_type()) |
896 | #define VNC_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VNC_SERVER_TYPE, VNCServer)); |
897 | |
898 | +#define VNC_SERVER_SIGNAL_NEW_CONNECTION "new-connection" |
899 | + |
900 | typedef struct VNCServerPrivate VNCServerPrivate; |
901 | |
902 | typedef struct |
903 | |
904 | === modified file 'src/x-server-local.c' |
905 | --- src/x-server-local.c 2014-09-19 03:16:14 +0000 |
906 | +++ src/x-server-local.c 2014-09-29 23:49:17 +0000 |
907 | @@ -439,8 +439,8 @@ |
908 | |
909 | server->priv->x_server_process = process_new (run_cb, server); |
910 | process_set_clear_environment (server->priv->x_server_process, TRUE); |
911 | - g_signal_connect (server->priv->x_server_process, "got-signal", G_CALLBACK (got_signal_cb), server); |
912 | - g_signal_connect (server->priv->x_server_process, "stopped", G_CALLBACK (stopped_cb), server); |
913 | + g_signal_connect (server->priv->x_server_process, PROCESS_SIGNAL_GOT_SIGNAL, G_CALLBACK (got_signal_cb), server); |
914 | + g_signal_connect (server->priv->x_server_process, PROCESS_SIGNAL_STOPPED, G_CALLBACK (stopped_cb), server); |
915 | |
916 | /* Setup logging */ |
917 | filename = g_strdup_printf ("%s.log", display_server_get_name (display_server)); |
918 | |
919 | === modified file 'src/x-server-xvnc.c' |
920 | --- src/x-server-xvnc.c 2014-09-19 03:16:14 +0000 |
921 | +++ src/x-server-xvnc.c 2014-09-29 23:49:17 +0000 |
922 | @@ -195,8 +195,8 @@ |
923 | |
924 | server->priv->x_server_process = process_new (run_cb, server); |
925 | process_set_clear_environment (server->priv->x_server_process, TRUE); |
926 | - g_signal_connect (server->priv->x_server_process, "got-signal", G_CALLBACK (got_signal_cb), server); |
927 | - g_signal_connect (server->priv->x_server_process, "stopped", G_CALLBACK (stopped_cb), server); |
928 | + g_signal_connect (server->priv->x_server_process, PROCESS_SIGNAL_GOT_SIGNAL, G_CALLBACK (got_signal_cb), server); |
929 | + g_signal_connect (server->priv->x_server_process, PROCESS_SIGNAL_STOPPED, G_CALLBACK (stopped_cb), server); |
930 | |
931 | /* Setup logging */ |
932 | filename = g_strdup_printf ("%s.log", display_server_get_name (display_server)); |
933 | |
934 | === modified file 'src/xdmcp-server.c' |
935 | --- src/xdmcp-server.c 2014-09-19 03:16:14 +0000 |
936 | +++ src/xdmcp-server.c 2014-09-29 23:49:17 +0000 |
937 | @@ -703,7 +703,7 @@ |
938 | g_type_class_add_private (klass, sizeof (XDMCPServerPrivate)); |
939 | |
940 | signals[NEW_SESSION] = |
941 | - g_signal_new ("new-session", |
942 | + g_signal_new (XDMCP_SERVER_SIGNAL_NEW_SESSION, |
943 | G_TYPE_FROM_CLASS (klass), |
944 | G_SIGNAL_RUN_LAST, |
945 | G_STRUCT_OFFSET (XDMCPServerClass, new_session), |
946 | |
947 | === modified file 'src/xdmcp-server.h' |
948 | --- src/xdmcp-server.h 2014-09-19 03:16:14 +0000 |
949 | +++ src/xdmcp-server.h 2014-09-29 23:49:17 +0000 |
950 | @@ -21,6 +21,8 @@ |
951 | #define XDMCP_SERVER_TYPE (xdmcp_server_get_type()) |
952 | #define XDMCP_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XDMCP_SERVER_TYPE, XDMCPServer)); |
953 | |
954 | +#define XDMCP_SERVER_SIGNAL_NEW_SESSION "new-session" |
955 | + |
956 | typedef struct XDMCPServerPrivate XDMCPServerPrivate; |
957 | |
958 | typedef struct |
959 | |
960 | === modified file 'tests/src/X.c' |
961 | --- tests/src/X.c 2014-09-19 03:16:14 +0000 |
962 | +++ tests/src/X.c 2014-09-29 23:49:17 +0000 |
963 | @@ -317,8 +317,8 @@ |
964 | status_connect (request_cb, id); |
965 | |
966 | xserver = x_server_new (display_number); |
967 | - g_signal_connect (xserver, "client-connected", G_CALLBACK (client_connected_cb), NULL); |
968 | - g_signal_connect (xserver, "client-disconnected", G_CALLBACK (client_disconnected_cb), NULL); |
969 | + g_signal_connect (xserver, X_SERVER_SIGNAL_CLIENT_CONNECTED, G_CALLBACK (client_connected_cb), NULL); |
970 | + g_signal_connect (xserver, X_SERVER_SIGNAL_CLIENT_DISCONNECTED, G_CALLBACK (client_disconnected_cb), NULL); |
971 | |
972 | status_text = g_string_new (""); |
973 | g_string_printf (status_text, "%s START", id); |
974 | @@ -415,11 +415,11 @@ |
975 | xdmcp_client_set_hostname (xdmcp_client, xdmcp_host); |
976 | if (xdmcp_port > 0) |
977 | xdmcp_client_set_port (xdmcp_client, xdmcp_port); |
978 | - g_signal_connect (xdmcp_client, "query", G_CALLBACK (xdmcp_query_cb), NULL); |
979 | - g_signal_connect (xdmcp_client, "willing", G_CALLBACK (xdmcp_willing_cb), NULL); |
980 | - g_signal_connect (xdmcp_client, "accept", G_CALLBACK (xdmcp_accept_cb), NULL); |
981 | - g_signal_connect (xdmcp_client, "decline", G_CALLBACK (xdmcp_decline_cb), NULL); |
982 | - g_signal_connect (xdmcp_client, "failed", G_CALLBACK (xdmcp_failed_cb), NULL); |
983 | + g_signal_connect (xdmcp_client, XDMCP_CLIENT_SIGNAL_QUERY, G_CALLBACK (xdmcp_query_cb), NULL); |
984 | + g_signal_connect (xdmcp_client, XDMCP_CLIENT_SIGNAL_WILLING, G_CALLBACK (xdmcp_willing_cb), NULL); |
985 | + g_signal_connect (xdmcp_client, XDMCP_CLIENT_SIGNAL_ACCEPT, G_CALLBACK (xdmcp_accept_cb), NULL); |
986 | + g_signal_connect (xdmcp_client, XDMCP_CLIENT_SIGNAL_DECLINE, G_CALLBACK (xdmcp_decline_cb), NULL); |
987 | + g_signal_connect (xdmcp_client, XDMCP_CLIENT_SIGNAL_FAILED, G_CALLBACK (xdmcp_failed_cb), NULL); |
988 | } |
989 | |
990 | g_main_loop_run (loop); |
991 | |
992 | === modified file 'tests/src/Xvnc.c' |
993 | --- tests/src/Xvnc.c 2014-09-19 03:16:14 +0000 |
994 | +++ tests/src/Xvnc.c 2014-09-29 23:49:17 +0000 |
995 | @@ -225,8 +225,8 @@ |
996 | status_connect (request_cb, id); |
997 | |
998 | xserver = x_server_new (display_number); |
999 | - g_signal_connect (xserver, "client-connected", G_CALLBACK (client_connected_cb), NULL); |
1000 | - g_signal_connect (xserver, "client-disconnected", G_CALLBACK (client_disconnected_cb), NULL); |
1001 | + g_signal_connect (xserver, X_SERVER_SIGNAL_CLIENT_CONNECTED, G_CALLBACK (client_connected_cb), NULL); |
1002 | + g_signal_connect (xserver, X_SERVER_SIGNAL_CLIENT_DISCONNECTED, G_CALLBACK (client_disconnected_cb), NULL); |
1003 | |
1004 | status_notify ("%s START GEOMETRY=%s DEPTH=%d OPTION=%s", id, geometry, depth, has_option ? "TRUE" : "FALSE"); |
1005 | |
1006 | |
1007 | === modified file 'tests/src/test-gobject-greeter.c' |
1008 | --- tests/src/test-gobject-greeter.c 2014-09-04 04:52:04 +0000 |
1009 | +++ tests/src/test-gobject-greeter.c 2014-09-29 23:49:17 +0000 |
1010 | @@ -238,7 +238,7 @@ |
1011 | username = g_hash_table_lookup (params, "USERNAME"); |
1012 | user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username); |
1013 | if (user) |
1014 | - g_signal_connect (user, "changed", G_CALLBACK (user_changed_cb), NULL); |
1015 | + g_signal_connect (user, LIGHTDM_SIGNAL_USER_CHANGED, G_CALLBACK (user_changed_cb), NULL); |
1016 | status_notify ("%s WATCH-USER USERNAME=%s", greeter_id, username); |
1017 | } |
1018 | |
1019 | @@ -482,21 +482,21 @@ |
1020 | } |
1021 | |
1022 | greeter = lightdm_greeter_new (); |
1023 | - g_signal_connect (greeter, "show-message", G_CALLBACK (show_message_cb), NULL); |
1024 | - g_signal_connect (greeter, "show-prompt", G_CALLBACK (show_prompt_cb), NULL); |
1025 | - g_signal_connect (greeter, "authentication-complete", G_CALLBACK (authentication_complete_cb), NULL); |
1026 | - g_signal_connect (greeter, "autologin-timer-expired", G_CALLBACK (autologin_timer_expired_cb), NULL); |
1027 | + g_signal_connect (greeter, LIGHTDM_GREETER_SIGNAL_SHOW_MESSAGE, G_CALLBACK (show_message_cb), NULL); |
1028 | + g_signal_connect (greeter, LIGHTDM_GREETER_SIGNAL_SHOW_PROMPT, G_CALLBACK (show_prompt_cb), NULL); |
1029 | + g_signal_connect (greeter, LIGHTDM_GREETER_SIGNAL_AUTHENTICATION_COMPLETE, G_CALLBACK (authentication_complete_cb), NULL); |
1030 | + g_signal_connect (greeter, LIGHTDM_GREETER_SIGNAL_AUTOLOGIN_TIMER_EXPIRED, G_CALLBACK (autologin_timer_expired_cb), NULL); |
1031 | if (g_key_file_get_boolean (config, "test-greeter-config", "resettable", NULL)) |
1032 | { |
1033 | lightdm_greeter_set_resettable (greeter, TRUE); |
1034 | - g_signal_connect (greeter, "idle", G_CALLBACK (idle_cb), NULL); |
1035 | - g_signal_connect (greeter, "reset", G_CALLBACK (reset_cb), NULL); |
1036 | + g_signal_connect (greeter, LIGHTDM_GREETER_SIGNAL_IDLE, G_CALLBACK (idle_cb), NULL); |
1037 | + g_signal_connect (greeter, LIGHTDM_GREETER_SIGNAL_RESET, G_CALLBACK (reset_cb), NULL); |
1038 | } |
1039 | |
1040 | if (g_key_file_get_boolean (config, "test-greeter-config", "log-user-changes", NULL)) |
1041 | { |
1042 | - g_signal_connect (lightdm_user_list_get_instance (), "user-added", G_CALLBACK (user_added_cb), NULL); |
1043 | - g_signal_connect (lightdm_user_list_get_instance (), "user-removed", G_CALLBACK (user_removed_cb), NULL); |
1044 | + g_signal_connect (lightdm_user_list_get_instance (), LIGHTDM_USER_LIST_SIGNAL_USER_ADDED, G_CALLBACK (user_added_cb), NULL); |
1045 | + g_signal_connect (lightdm_user_list_get_instance (), LIGHTDM_USER_LIST_SIGNAL_USER_REMOVED, G_CALLBACK (user_removed_cb), NULL); |
1046 | } |
1047 | |
1048 | status_notify ("%s CONNECT-TO-DAEMON", greeter_id); |
1049 | |
1050 | === modified file 'tests/src/x-server.c' |
1051 | --- tests/src/x-server.c 2014-09-19 03:16:14 +0000 |
1052 | +++ tests/src/x-server.c 2014-09-29 23:49:17 +0000 |
1053 | @@ -90,7 +90,7 @@ |
1054 | g_type_class_add_private (klass, sizeof (XClientPrivate)); |
1055 | |
1056 | x_client_signals[X_CLIENT_DISCONNECTED] = |
1057 | - g_signal_new ("disconnected", |
1058 | + g_signal_new (X_CLIENT_SIGNAL_DISCONNECTED, |
1059 | G_TYPE_FROM_CLASS (klass), |
1060 | G_SIGNAL_RUN_LAST, |
1061 | G_STRUCT_OFFSET (XClientClass, disconnected), |
1062 | @@ -132,7 +132,7 @@ |
1063 | |
1064 | client = g_object_new (x_client_get_type (), NULL); |
1065 | client->priv->server = server; |
1066 | - g_signal_connect (client, "disconnected", G_CALLBACK (x_client_disconnected_cb), server); |
1067 | + g_signal_connect (client, X_CLIENT_SIGNAL_DISCONNECTED, G_CALLBACK (x_client_disconnected_cb), server); |
1068 | client->priv->socket = data_socket; |
1069 | client->priv->channel = g_io_channel_unix_new (g_socket_get_fd (data_socket)); |
1070 | g_hash_table_insert (server->priv->clients, client->priv->channel, client); |
1071 | @@ -195,7 +195,7 @@ |
1072 | object_class->finalize = x_server_finalize; |
1073 | g_type_class_add_private (klass, sizeof (XServerPrivate)); |
1074 | x_server_signals[X_SERVER_CLIENT_CONNECTED] = |
1075 | - g_signal_new ("client-connected", |
1076 | + g_signal_new (X_SERVER_SIGNAL_CLIENT_CONNECTED, |
1077 | G_TYPE_FROM_CLASS (klass), |
1078 | G_SIGNAL_RUN_LAST, |
1079 | G_STRUCT_OFFSET (XServerClass, client_connected), |
1080 | @@ -203,7 +203,7 @@ |
1081 | NULL, |
1082 | G_TYPE_NONE, 1, x_client_get_type ()); |
1083 | x_server_signals[X_SERVER_CLIENT_DISCONNECTED] = |
1084 | - g_signal_new ("client-disconnected", |
1085 | + g_signal_new (X_SERVER_SIGNAL_CLIENT_DISCONNECTED, |
1086 | G_TYPE_FROM_CLASS (klass), |
1087 | G_SIGNAL_RUN_LAST, |
1088 | G_STRUCT_OFFSET (XServerClass, client_disconnected), |
1089 | |
1090 | === modified file 'tests/src/x-server.h' |
1091 | --- tests/src/x-server.h 2013-05-17 03:10:13 +0000 |
1092 | +++ tests/src/x-server.h 2014-09-29 23:49:17 +0000 |
1093 | @@ -6,6 +6,11 @@ |
1094 | |
1095 | G_BEGIN_DECLS |
1096 | |
1097 | +#define X_CLIENT_SIGNAL_DISCONNECTED "disconnected" |
1098 | + |
1099 | +#define X_SERVER_SIGNAL_CLIENT_CONNECTED "client-connected" |
1100 | +#define X_SERVER_SIGNAL_CLIENT_DISCONNECTED "client-disconnected" |
1101 | + |
1102 | typedef struct XClientPrivate XClientPrivate; |
1103 | |
1104 | typedef struct |
1105 | |
1106 | === modified file 'tests/src/xdmcp-client.c' |
1107 | --- tests/src/xdmcp-client.c 2014-09-19 03:16:14 +0000 |
1108 | +++ tests/src/xdmcp-client.c 2014-09-29 23:49:17 +0000 |
1109 | @@ -438,7 +438,7 @@ |
1110 | object_class->finalize = xdmcp_client_finalize; |
1111 | g_type_class_add_private (klass, sizeof (XDMCPClientPrivate)); |
1112 | xdmcp_client_signals[XDMCP_CLIENT_QUERY] = |
1113 | - g_signal_new ("query", |
1114 | + g_signal_new (XDMCP_CLIENT_SIGNAL_QUERY, |
1115 | G_TYPE_FROM_CLASS (klass), |
1116 | G_SIGNAL_RUN_LAST, |
1117 | G_STRUCT_OFFSET (XDMCPClientClass, query), |
1118 | @@ -446,7 +446,7 @@ |
1119 | NULL, |
1120 | G_TYPE_NONE, 0); |
1121 | xdmcp_client_signals[XDMCP_CLIENT_WILLING] = |
1122 | - g_signal_new ("willing", |
1123 | + g_signal_new (XDMCP_CLIENT_SIGNAL_WILLING, |
1124 | G_TYPE_FROM_CLASS (klass), |
1125 | G_SIGNAL_RUN_LAST, |
1126 | G_STRUCT_OFFSET (XDMCPClientClass, willing), |
1127 | @@ -454,7 +454,7 @@ |
1128 | NULL, |
1129 | G_TYPE_NONE, 1, G_TYPE_POINTER); |
1130 | xdmcp_client_signals[XDMCP_CLIENT_ACCEPT] = |
1131 | - g_signal_new ("accept", |
1132 | + g_signal_new (XDMCP_CLIENT_SIGNAL_ACCEPT, |
1133 | G_TYPE_FROM_CLASS (klass), |
1134 | G_SIGNAL_RUN_LAST, |
1135 | G_STRUCT_OFFSET (XDMCPClientClass, accept), |
1136 | @@ -462,7 +462,7 @@ |
1137 | NULL, |
1138 | G_TYPE_NONE, 1, G_TYPE_POINTER); |
1139 | xdmcp_client_signals[XDMCP_CLIENT_DECLINE] = |
1140 | - g_signal_new ("decline", |
1141 | + g_signal_new (XDMCP_CLIENT_SIGNAL_DECLINE, |
1142 | G_TYPE_FROM_CLASS (klass), |
1143 | G_SIGNAL_RUN_LAST, |
1144 | G_STRUCT_OFFSET (XDMCPClientClass, decline), |
1145 | @@ -470,7 +470,7 @@ |
1146 | NULL, |
1147 | G_TYPE_NONE, 1, G_TYPE_POINTER); |
1148 | xdmcp_client_signals[XDMCP_CLIENT_FAILED] = |
1149 | - g_signal_new ("failed", |
1150 | + g_signal_new (XDMCP_CLIENT_SIGNAL_FAILED, |
1151 | G_TYPE_FROM_CLASS (klass), |
1152 | G_SIGNAL_RUN_LAST, |
1153 | G_STRUCT_OFFSET (XDMCPClientClass, failed), |
1154 | |
1155 | === modified file 'tests/src/xdmcp-client.h' |
1156 | --- tests/src/xdmcp-client.h 2013-04-23 03:07:03 +0000 |
1157 | +++ tests/src/xdmcp-client.h 2014-09-29 23:49:17 +0000 |
1158 | @@ -7,6 +7,12 @@ |
1159 | #define XDMCP_VERSION 1 |
1160 | #define XDMCP_PORT 177 |
1161 | |
1162 | +#define XDMCP_CLIENT_SIGNAL_QUERY "query" |
1163 | +#define XDMCP_CLIENT_SIGNAL_WILLING "willing" |
1164 | +#define XDMCP_CLIENT_SIGNAL_ACCEPT "accept" |
1165 | +#define XDMCP_CLIENT_SIGNAL_DECLINE "decline" |
1166 | +#define XDMCP_CLIENT_SIGNAL_FAILED "failed" |
1167 | + |
1168 | typedef struct |
1169 | { |
1170 | gchar *authentication_name; |
I think the improvement is marginal but every bit helps. Thanks Jesús!