summaryrefslogtreecommitdiff
path: root/telepathy-glib/simple-password-manager.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2011-12-13 14:00:54 +0100
committerXavier Claessens <xclaesse@gmail.com>2011-12-14 11:39:35 +0100
commitcbd087f7f8959ad0208ba35d0a2a68fd60e6a1fe (patch)
tree03eacd0a97b295385f9daef5ed95791c1982e888 /telepathy-glib/simple-password-manager.c
parent15bf9ec4887974ee5a3d676821cc9f7623c72bfd (diff)
downloadtelepathy-glib-cbd087f7f8959ad0208ba35d0a2a68fd60e6a1fe.tar.gz
Simplify _finish() functions using _tp_implement_finish_*
Diffstat (limited to 'telepathy-glib/simple-password-manager.c')
-rw-r--r--telepathy-glib/simple-password-manager.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/telepathy-glib/simple-password-manager.c b/telepathy-glib/simple-password-manager.c
index cdb75b8d9..93291e727 100644
--- a/telepathy-glib/simple-password-manager.c
+++ b/telepathy-glib/simple-password-manager.c
@@ -76,6 +76,7 @@
#define DEBUG_FLAG TP_DEBUG_SASL
#include "telepathy-glib/debug-internal.h"
#include "telepathy-glib/base-password-channel.h"
+#include "telepathy-glib/util-internal.h"
static void channel_manager_iface_init (gpointer, gpointer);
static void tp_simple_password_manager_close_all (TpSimplePasswordManager *self);
@@ -461,21 +462,8 @@ tp_simple_password_manager_prompt_finish (
GAsyncResult *result,
GError **error)
{
- GSimpleAsyncResult *simple;
-
- g_return_val_if_fail (TP_IS_SIMPLE_PASSWORD_MANAGER (self), NULL);
- g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), NULL);
-
- simple = G_SIMPLE_ASYNC_RESULT (result);
-
- if (g_simple_async_result_propagate_error (simple, error))
- return NULL;
-
- g_return_val_if_fail (g_simple_async_result_is_valid (result,
- G_OBJECT (self), tp_simple_password_manager_prompt_async),
- NULL);
-
- return g_simple_async_result_get_op_res_gpointer (simple);
+ _tp_implement_finish_return_copy_pointer (self,
+ tp_simple_password_manager_prompt_async, /* do not copy */);
}
/**