diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-09-05 17:55:06 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-09-10 19:23:10 +0100 |
| commit | 51357aacd99dd5f0057aeb9f743a2e696e10d7b3 (patch) | |
| tree | 0482838a4d00df312aa043c339a3b68b7035e699 | |
| parent | 444c32b0de9e97b0046ef613c1c15eb9e8ef5ff8 (diff) | |
| download | telepathy-mission-control-51357aacd99dd5f0057aeb9f743a2e696e10d7b3.tar.gz | |
Rename MC_ACCOUNTS_KEY_ALIAS to MC_ACCOUNTS_KEY_NICKNAME
Its value is actually "Nickname" so its name should follow.
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | src/mcd-account-config.h | 2 | ||||
| -rw-r--r-- | src/mcd-account.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/mcd-account-config.h b/src/mcd-account-config.h index 2d6d053f..04a84c96 100644 --- a/src/mcd-account-config.h +++ b/src/mcd-account-config.h @@ -44,10 +44,10 @@ #define MC_ACCOUNTS_KEY_AUTO_PRESENCE_TYPE "AutomaticPresenceType" #define MC_ACCOUNTS_KEY_AUTO_PRESENCE_STATUS "AutomaticPresenceStatus" #define MC_ACCOUNTS_KEY_AUTO_PRESENCE_MESSAGE "AutomaticPresenceMessage" +#define MC_ACCOUNTS_KEY_NICKNAME "Nickname" #define MC_ACCOUNTS_KEY_CONNECT_AUTOMATICALLY "ConnectAutomatically" #define MC_ACCOUNTS_KEY_HAS_BEEN_ONLINE "HasBeenOnline" #define MC_ACCOUNTS_KEY_DATA_DIR "data_dir" -#define MC_ACCOUNTS_KEY_ALIAS "Nickname" #define MC_ACCOUNTS_KEY_SECONDARY_VCARD_FIELDS "secondary_vcard_fields" #define MC_ACCOUNTS_KEY_HIDDEN "Hidden" #define MC_ACCOUNTS_KEY_ALWAYS_DISPATCH "always_dispatch" diff --git a/src/mcd-account.c b/src/mcd-account.c index af48434d..d006c266 100644 --- a/src/mcd-account.c +++ b/src/mcd-account.c @@ -1269,7 +1269,8 @@ set_nickname (TpSvcDBusProperties *self, const gchar *name, SetResult ret; DEBUG ("called for %s", priv->unique_name); - ret = mcd_account_set_string_val (account, name, value, error); + ret = mcd_account_set_string_val (account, MC_ACCOUNTS_KEY_NICKNAME, + value, error); /* we need to call _mcd_connection_set_nickname for side effects, * * as that is how the CM is informed of the current nickname, even * @@ -1289,7 +1290,7 @@ get_nickname (TpSvcDBusProperties *self, const gchar *name, GValue *value) { McdAccount *account = MCD_ACCOUNT (self); - mcd_account_get_string_val (account, name, value); + mcd_account_get_string_val (account, MC_ACCOUNTS_KEY_NICKNAME, value); } static gboolean @@ -3953,7 +3954,8 @@ mcd_account_connection_self_nickname_changed_cb (McdAccount *account, g_value_init (&value, G_TYPE_STRING); g_value_set_static_string (&value, alias); - mcd_account_set_string_val (account, MC_ACCOUNTS_KEY_ALIAS, &value, NULL); + mcd_account_set_string_val (account, MC_ACCOUNTS_KEY_NICKNAME, + &value, NULL); g_value_unset (&value); } @@ -3964,7 +3966,7 @@ mcd_account_get_alias (McdAccount *account) const gchar *account_name = mcd_account_get_unique_name (account); return mcd_storage_dup_string (priv->storage, account_name, - MC_ACCOUNTS_KEY_ALIAS); + MC_ACCOUNTS_KEY_NICKNAME); } static void |