diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-11 17:51:36 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-17 16:31:17 +0000 |
| commit | 0ae19e84dcf8a0cd9b8cc4c01355ebbd1cdcd19b (patch) | |
| tree | 93b42f7ab5aa659fadd987715e7cd401d42fec91 | |
| parent | c0fed7259819791a5cc23b2eddbf98183f2793af (diff) | |
replace dbus_g_method_return_error + g_error_free with g_dbus_method_invocation_take_error
| -rw-r--r-- | telepathy-glib/base-client.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c index 8728a6310..6bbb380cf 100644 --- a/telepathy-glib/base-client.c +++ b/telepathy-glib/base-client.c @@ -1587,8 +1587,7 @@ out: if (error == NULL) return; - dbus_g_method_return_error (context, error); - g_error_free (error); + g_dbus_method_invocation_take_error (context, error); } static void @@ -1765,9 +1764,7 @@ out: if (error == NULL) return; - dbus_g_method_return_error (context, error); - g_error_free (error); - + g_dbus_method_invocation_take_error (context, error); } static void @@ -2083,8 +2080,7 @@ out: if (error == NULL) return; - dbus_g_method_return_error (context, error); - g_error_free (error); + g_dbus_method_invocation_take_error (context, error); } static void @@ -2200,8 +2196,7 @@ _tp_base_client_add_request (TpSvcClientInterfaceRequests *iface, err: g_clear_object (&account); - dbus_g_method_return_error (context, error); - g_error_free (error); + g_dbus_method_invocation_take_error (context, error); } static void |