diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2011-02-01 16:50:22 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2011-02-01 16:50:22 +0800 |
| commit | 38a7c551fb07d72dd7b6744a8d1a345466b011d2 (patch) | |
| tree | 3eca2564dbb6240421e1d7b43e8cb1898f73bd0c /libempathy/empathy-server-sasl-handler.c | |
| parent | 7f5c02a63be19988ab199e497e22cd93880ae0bd (diff) | |
| parent | b03dfefd8103ea41f61407df122021a6d14d5a19 (diff) | |
| download | gsoc2013-empathy-38a7c551fb07d72dd7b6744a8d1a345466b011d2.tar gsoc2013-empathy-38a7c551fb07d72dd7b6744a8d1a345466b011d2.tar.gz gsoc2013-empathy-38a7c551fb07d72dd7b6744a8d1a345466b011d2.tar.bz2 gsoc2013-empathy-38a7c551fb07d72dd7b6744a8d1a345466b011d2.tar.lz gsoc2013-empathy-38a7c551fb07d72dd7b6744a8d1a345466b011d2.tar.xz gsoc2013-empathy-38a7c551fb07d72dd7b6744a8d1a345466b011d2.tar.zst gsoc2013-empathy-38a7c551fb07d72dd7b6744a8d1a345466b011d2.zip | |
Merge branch 'muc-password'
Diffstat (limited to 'libempathy/empathy-server-sasl-handler.c')
| -rw-r--r-- | libempathy/empathy-server-sasl-handler.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c index 3cfc86fa8..4b5683881 100644 --- a/libempathy/empathy-server-sasl-handler.c +++ b/libempathy/empathy-server-sasl-handler.c @@ -124,7 +124,7 @@ empathy_server_sasl_handler_get_password_async_cb (GObject *source, priv = EMPATHY_SERVER_SASL_HANDLER (user_data)->priv; - password = empathy_keyring_get_password_finish (TP_ACCOUNT (source), + password = empathy_keyring_get_account_password_finish (TP_ACCOUNT (source), result, &error); if (password != NULL) @@ -155,7 +155,7 @@ empathy_server_sasl_handler_init_async (GAsyncInitable *initable, priv->async_init_res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, empathy_server_sasl_handler_new_async); - empathy_keyring_get_password_async (priv->account, + empathy_keyring_get_account_password_async (priv->account, empathy_server_sasl_handler_get_password_async_cb, self); } @@ -374,7 +374,7 @@ empathy_server_sasl_handler_set_password_cb (GObject *source, { GError *error = NULL; - if (!empathy_keyring_set_password_finish (TP_ACCOUNT (source), result, + if (!empathy_keyring_set_account_password_finish (TP_ACCOUNT (source), result, &error)) { DEBUG ("Failed to set password: %s", error->message); @@ -416,7 +416,7 @@ empathy_server_sasl_handler_provide_password ( if (remember) { - empathy_keyring_set_password_async (priv->account, password, + empathy_keyring_set_account_password_async (priv->account, password, empathy_server_sasl_handler_set_password_cb, NULL); } } |