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 /common | |
parent | 5a4aebf77fdd5fb190622ddc18987047fdbc4ca9 (diff) | |
download | lightdm-013cdf4ccd52d6f97cafcdd0bdd7dbc2b71fda1a.tar.gz |
Refactored code to replace hardcoded signal identification strings by constants.
Diffstat (limited to 'common')
-rw-r--r-- | common/user-list.c | 12 | ||||
-rw-r--r-- | common/user-list.h | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/common/user-list.c b/common/user-list.c index 3b8d5a15..996ece8b 100644 --- a/common/user-list.c +++ b/common/user-list.c @@ -407,7 +407,7 @@ load_passwd_file (CommonUserList *user_list, gboolean emit_add_signal) { CommonUser *info = link->data; g_debug ("User %s added", common_user_get_name (info)); - g_signal_connect (info, "changed", G_CALLBACK (user_changed_cb), NULL); + g_signal_connect (info, USER_SIGNAL_CHANGED, G_CALLBACK (user_changed_cb), NULL); if (emit_add_signal) g_signal_emit (user_list, list_signals[USER_ADDED], 0, info); } @@ -603,7 +603,7 @@ add_accounts_user (CommonUserList *user_list, const gchar *path, gboolean emit_s g_debug ("User %s added", path); priv->user_list = user_list; priv->path = g_strdup (path); - g_signal_connect (user, "changed", G_CALLBACK (user_changed_cb), NULL); + g_signal_connect (user, USER_SIGNAL_CHANGED, G_CALLBACK (user_changed_cb), NULL); if (load_accounts_user (user)) { list_priv->users = g_list_insert_sorted (list_priv->users, user, compare_user); @@ -1090,7 +1090,7 @@ common_user_list_class_init (CommonUserListClass *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 (USER_LIST_SIGNAL_USER_ADDED, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CommonUserListClass, user_added), @@ -1106,7 +1106,7 @@ common_user_list_class_init (CommonUserListClass *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 (USER_LIST_SIGNAL_USER_CHANGED, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CommonUserListClass, user_changed), @@ -1122,7 +1122,7 @@ common_user_list_class_init (CommonUserListClass *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 (USER_LIST_SIGNAL_USER_REMOVED, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CommonUserListClass, user_removed), @@ -1763,7 +1763,7 @@ common_user_class_init (CommonUserClass *klass) * The ::changed signal gets emitted this user account is modified. **/ user_signals[CHANGED] = - g_signal_new ("changed", + g_signal_new (USER_SIGNAL_CHANGED, G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CommonUserClass, changed), diff --git a/common/user-list.h b/common/user-list.h index 0d38cfe9..8d16e8d0 100644 --- a/common/user-list.h +++ b/common/user-list.h @@ -32,6 +32,12 @@ G_BEGIN_DECLS #define COMMON_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), COMMON_TYPE_USER)) #define COMMON_USER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), COMMON_TYPE_USER, CommonUserClass)) +#define USER_LIST_SIGNAL_USER_ADDED "user-added" +#define USER_LIST_SIGNAL_USER_CHANGED "user-changed" +#define USER_LIST_SIGNAL_USER_REMOVED "user-removed" + +#define USER_SIGNAL_CHANGED "changed" + typedef struct { GObject parent_instance; |