diff options
author | Jesús González <jgonzalez@gdr-sistemas.com> | 2014-09-30 01:42:38 +0200 |
---|---|---|
committer | Jesús González <jgonzalez@gdr-sistemas.com> | 2014-09-30 01:42:38 +0200 |
commit | 013cdf4ccd52d6f97cafcdd0bdd7dbc2b71fda1a (patch) | |
tree | 6151ff138b44891f11bebed596f0b8ad11df372c /liblightdm-gobject | |
parent | 5a4aebf77fdd5fb190622ddc18987047fdbc4ca9 (diff) | |
download | lightdm-013cdf4ccd52d6f97cafcdd0bdd7dbc2b71fda1a.tar.gz |
Refactored code to replace hardcoded signal identification strings by constants.
Diffstat (limited to 'liblightdm-gobject')
-rw-r--r-- | liblightdm-gobject/greeter.c | 12 | ||||
-rw-r--r-- | liblightdm-gobject/lightdm/greeter.h | 7 | ||||
-rw-r--r-- | liblightdm-gobject/lightdm/user.h | 6 | ||||
-rw-r--r-- | liblightdm-gobject/user.c | 16 |
4 files changed, 27 insertions, 14 deletions
diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c index 8214490c..1c281450 100644 --- a/liblightdm-gobject/greeter.c +++ b/liblightdm-gobject/greeter.c @@ -1804,7 +1804,7 @@ lightdm_greeter_class_init (LightDMGreeterClass *klass) * lightdm_greeter_cancel_authentication() to abort the authentication. **/ signals[SHOW_PROMPT] = - g_signal_new ("show-prompt", + g_signal_new (LIGHTDM_GREETER_SIGNAL_SHOW_PROMPT, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LightDMGreeterClass, show_prompt), @@ -1822,7 +1822,7 @@ lightdm_greeter_class_init (LightDMGreeterClass *klass) * should show a message to the user. **/ signals[SHOW_MESSAGE] = - g_signal_new ("show-message", + g_signal_new (LIGHTDM_GREETER_SIGNAL_SHOW_MESSAGE, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LightDMGreeterClass, show_message), @@ -1841,7 +1841,7 @@ lightdm_greeter_class_init (LightDMGreeterClass *klass) * was successful. **/ signals[AUTHENTICATION_COMPLETE] = - g_signal_new ("authentication-complete", + g_signal_new (LIGHTDM_GREETER_SIGNAL_AUTHENTICATION_COMPLETE, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LightDMGreeterClass, authentication_complete), @@ -1857,7 +1857,7 @@ lightdm_greeter_class_init (LightDMGreeterClass *klass) * The application should then call lightdm_greeter_login(). **/ signals[AUTOLOGIN_TIMER_EXPIRED] = - g_signal_new ("autologin-timer-expired", + g_signal_new (LIGHTDM_GREETER_SIGNAL_AUTOLOGIN_TIMER_EXPIRED, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LightDMGreeterClass, autologin_timer_expired), @@ -1876,7 +1876,7 @@ lightdm_greeter_class_init (LightDMGreeterClass *klass) * resettable using lightdm_greeter_set_resettable(). **/ signals[IDLE] = - g_signal_new ("idle", + g_signal_new (LIGHTDM_GREETER_SIGNAL_IDLE, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LightDMGreeterClass, idle), @@ -1895,7 +1895,7 @@ lightdm_greeter_class_init (LightDMGreeterClass *klass) * resettable using lightdm_greeter_set_resettable(). **/ signals[RESET] = - g_signal_new ("reset", + g_signal_new (LIGHTDM_GREETER_SIGNAL_RESET, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LightDMGreeterClass, reset), diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h index 68a81b54..0d046479 100644 --- a/liblightdm-gobject/lightdm/greeter.h +++ b/liblightdm-gobject/lightdm/greeter.h @@ -23,6 +23,13 @@ G_BEGIN_DECLS #define LIGHTDM_IS_GREETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_GREETER)) #define LIGHTDM_GREETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeterClass)) +#define LIGHTDM_GREETER_SIGNAL_SHOW_PROMPT "show-prompt" +#define LIGHTDM_GREETER_SIGNAL_SHOW_MESSAGE "show-message" +#define LIGHTDM_GREETER_SIGNAL_AUTHENTICATION_COMPLETE "authentication-complete" +#define LIGHTDM_GREETER_SIGNAL_AUTOLOGIN_TIMER_EXPIRED "autologin-timer-expired" +#define LIGHTDM_GREETER_SIGNAL_IDLE "idle" +#define LIGHTDM_GREETER_SIGNAL_RESET "reset" + /** * LightDMPromptType: * @LIGHTDM_PROMPT_TYPE_QUESTION: Prompt is a question. The information can be shown as it is entered. diff --git a/liblightdm-gobject/lightdm/user.h b/liblightdm-gobject/lightdm/user.h index f955ab29..f2bea3fc 100644 --- a/liblightdm-gobject/lightdm/user.h +++ b/liblightdm-gobject/lightdm/user.h @@ -29,6 +29,12 @@ G_BEGIN_DECLS #define LIGHTDM_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_USER)) #define LIGHTDM_USER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_USER, LightDMUserClass)) +#define LIGHTDM_USER_LIST_SIGNAL_USER_ADDED "user-added" +#define LIGHTDM_USER_LIST_SIGNAL_USER_CHANGED "user-changed" +#define LIGHTDM_USER_LIST_SIGNAL_USER_REMOVED "user-removed" + +#define LIGHTDM_SIGNAL_USER_CHANGED "changed" + typedef struct { GObject parent_instance; diff --git a/liblightdm-gobject/user.c b/liblightdm-gobject/user.c index c4e5661e..f8355df2 100644 --- a/liblightdm-gobject/user.c +++ b/liblightdm-gobject/user.c @@ -104,7 +104,7 @@ static LightDMUser * wrap_common_user (CommonUser *user) { LightDMUser *lightdm_user = g_object_new (LIGHTDM_TYPE_USER, "common-user", user, NULL); - g_signal_connect (user, "changed", G_CALLBACK (user_changed_cb), lightdm_user); + g_signal_connect (user, USER_SIGNAL_CHANGED, G_CALLBACK (user_changed_cb), lightdm_user); return lightdm_user; } @@ -167,9 +167,9 @@ initialize_user_list_if_needed (LightDMUserList *user_list) priv->lightdm_list = g_list_reverse (priv->lightdm_list); CommonUserList *common_list = common_user_list_get_instance (); - g_signal_connect (common_list, "user-added", G_CALLBACK (user_list_added_cb), user_list); - g_signal_connect (common_list, "user-changed", G_CALLBACK (user_list_changed_cb), user_list); - g_signal_connect (common_list, "user-removed", G_CALLBACK (user_list_removed_cb), user_list); + g_signal_connect (common_list, USER_LIST_SIGNAL_USER_ADDED, G_CALLBACK (user_list_added_cb), user_list); + g_signal_connect (common_list, USER_LIST_SIGNAL_USER_CHANGED, G_CALLBACK (user_list_changed_cb), user_list); + g_signal_connect (common_list, USER_LIST_SIGNAL_USER_REMOVED, G_CALLBACK (user_list_removed_cb), user_list); priv->initialized = TRUE; } @@ -306,7 +306,7 @@ lightdm_user_list_class_init (LightDMUserListClass *klass) * The ::user-added signal gets emitted when a user account is created. **/ list_signals[USER_ADDED] = - g_signal_new ("user-added", + g_signal_new (LIGHTDM_USER_LIST_SIGNAL_USER_ADDED, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LightDMUserListClass, user_added), @@ -322,7 +322,7 @@ lightdm_user_list_class_init (LightDMUserListClass *klass) * The ::user-changed signal gets emitted when a user account is modified. **/ list_signals[USER_CHANGED] = - g_signal_new ("user-changed", + g_signal_new (LIGHTDM_USER_LIST_SIGNAL_USER_CHANGED, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LightDMUserListClass, user_changed), @@ -338,7 +338,7 @@ lightdm_user_list_class_init (LightDMUserListClass *klass) * The ::user-removed signal gets emitted when a user account is removed. **/ list_signals[USER_REMOVED] = - g_signal_new ("user-removed", + g_signal_new (LIGHTDM_USER_LIST_SIGNAL_USER_REMOVED, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LightDMUserListClass, user_removed), @@ -752,7 +752,7 @@ lightdm_user_class_init (LightDMUserClass *klass) * The ::changed signal gets emitted this user account is modified. **/ user_signals[CHANGED] = - g_signal_new ("changed", + g_signal_new (LIGHTDM_SIGNAL_USER_CHANGED, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LightDMUserClass, changed), |