aboutsummaryrefslogtreecommitdiffstats
path: root/goa-mc-plugin/mcp-account-manager-goa.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-02 16:51:43 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-02 16:58:58 +0800
commitfdf86339c44094f4e115283312dcd3f209a9f72b (patch)
tree50c9bfc62d3e9598644a018013b5416f8060ba73 /goa-mc-plugin/mcp-account-manager-goa.c
parent99d9177da27ddc4c4aaf5d40a6eae5b458084536 (diff)
downloadgsoc2013-empathy-fdf86339c44094f4e115283312dcd3f209a9f72b.tar
gsoc2013-empathy-fdf86339c44094f4e115283312dcd3f209a9f72b.tar.gz
gsoc2013-empathy-fdf86339c44094f4e115283312dcd3f209a9f72b.tar.bz2
gsoc2013-empathy-fdf86339c44094f4e115283312dcd3f209a9f72b.tar.lz
gsoc2013-empathy-fdf86339c44094f4e115283312dcd3f209a9f72b.tar.xz
gsoc2013-empathy-fdf86339c44094f4e115283312dcd3f209a9f72b.tar.zst
gsoc2013-empathy-fdf86339c44094f4e115283312dcd3f209a9f72b.zip
mcp-account-manager-goa: fix shadow variable warnings
Diffstat (limited to 'goa-mc-plugin/mcp-account-manager-goa.c')
-rw-r--r--goa-mc-plugin/mcp-account-manager-goa.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 5fd014ed5..bccb39447 100644
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -354,10 +354,10 @@ mcp_account_manager_goa_list (const McpAccountStorage *self,
static void
get_enabled (const McpAccountStorage *self,
const McpAccountManager *am,
- const gchar *acct,
+ const gchar *acc,
GoaObject *object)
{
- mcp_account_manager_set_value (am, acct, "Enabled",
+ mcp_account_manager_set_value (am, acc, "Enabled",
goa_object_peek_chat (object) != NULL ? "true" : "false");
}
@@ -365,16 +365,16 @@ get_enabled (const McpAccountStorage *self,
static gboolean
mcp_account_manager_goa_get (const McpAccountStorage *self,
const McpAccountManager *am,
- const gchar *acct,
+ const gchar *acc,
const gchar *key)
{
McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
GoaObject *object;
GoaAccount *account;
- DEBUG ("%s: %s, %s", G_STRFUNC, acct, key);
+ DEBUG ("%s: %s, %s", G_STRFUNC, acc, key);
- object = g_hash_table_lookup (priv->accounts, acct);
+ object = g_hash_table_lookup (priv->accounts, acc);
if (object == NULL)
return FALSE;
@@ -389,28 +389,28 @@ mcp_account_manager_goa_get (const McpAccountStorage *self,
/* load all keys */
GHashTable *params = get_tp_parameters (account);
GHashTableIter iter;
- gpointer key, value;
+ gpointer k, value;
GStrv keys;
guint i;
gssize nkeys = 0;
/* Properties from GOA */
g_hash_table_iter_init (&iter, params);
- while (g_hash_table_iter_next (&iter, &key, &value))
- mcp_account_manager_set_value (am, acct, key, value);
+ while (g_hash_table_iter_next (&iter, &k, &value))
+ mcp_account_manager_set_value (am, acc, k, value);
g_hash_table_unref (params);
/* Stored properties */
- keys = g_key_file_get_keys (priv->store, acct, &nkeys, NULL);
+ keys = g_key_file_get_keys (priv->store, acc, &nkeys, NULL);
for (i = 0; i < nkeys; i++)
{
- gchar *v = g_key_file_get_value (priv->store, acct, keys[i], NULL);
+ gchar *v = g_key_file_get_value (priv->store, acc, keys[i], NULL);
if (v != NULL)
{
- mcp_account_manager_set_value (am, acct, keys[i], v);
+ mcp_account_manager_set_value (am, acc, keys[i], v);
g_free (v);
}
}
@@ -418,11 +418,11 @@ mcp_account_manager_goa_get (const McpAccountStorage *self,
g_strfreev (keys);
/* Enabled */
- get_enabled (self, am, acct, object);
+ get_enabled (self, am, acc, object);
}
else if (!tp_strdiff (key, "Enabled"))
{
- get_enabled (self, am, acct, object);
+ get_enabled (self, am, acc, object);
}
else
{
@@ -433,11 +433,11 @@ mcp_account_manager_goa_get (const McpAccountStorage *self,
value = g_hash_table_lookup (params, key);
if (value == NULL)
- value = g_key_file_get_value (priv->store, acct, key, NULL);
+ value = g_key_file_get_value (priv->store, acc, key, NULL);
else
value = g_strdup (value);
- mcp_account_manager_set_value (am, acct, key, value);
+ mcp_account_manager_set_value (am, acc, key, value);
g_hash_table_unref (params);
g_free (value);
@@ -568,14 +568,14 @@ mcp_account_manager_goa_get_restrictions (const McpAccountStorage *self,
static void
mcp_account_manager_goa_get_identifier (const McpAccountStorage *self,
- const gchar *acct,
+ const gchar *acc,
GValue *identifier)
{
McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
GoaObject *object;
GoaAccount *account;
- object = g_hash_table_lookup (priv->accounts, acct);
+ object = g_hash_table_lookup (priv->accounts, acc);
g_return_if_fail (object != NULL);
account = goa_object_peek_account (object);