diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-04-09 15:27:32 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-04-09 15:27:32 +0000 |
| commit | 5038c135e99e06440900a3b10bf2ae5da6902456 (patch) | |
| tree | eb4b42fa5f885421769f86cb02ec1afa5df42906 /telepathy-glib/text-mixin.c | |
| parent | 4a99f5df6f86670fca373e3300c671eafa25a6cf (diff) | |
| download | telepathy-glib-5038c135e99e06440900a3b10bf2ae5da6902456.tar.gz | |
tp_text_mixin_get_message_types_async: inline tp_text_mixin_get_message_types (saving a malloc/free cycle for copying the GArray)
20080409152732-53eee-254b49fd20b1ee467644e04fec949f623cd2bd29.gz
Diffstat (limited to 'telepathy-glib/text-mixin.c')
| -rw-r--r-- | telepathy-glib/text-mixin.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/telepathy-glib/text-mixin.c b/telepathy-glib/text-mixin.c index e1929ac54..193faf6a7 100644 --- a/telepathy-glib/text-mixin.c +++ b/telepathy-glib/text-mixin.c @@ -552,19 +552,10 @@ static void tp_text_mixin_get_message_types_async (TpSvcChannelTypeText *iface, DBusGMethodInvocation *context) { - GArray *ret; - GError *error = NULL; + TpTextMixin *mixin = TP_TEXT_MIXIN (obj); - if (tp_text_mixin_get_message_types (G_OBJECT (iface), &ret, &error)) - { - tp_svc_channel_type_text_return_from_get_message_types (context, ret); - g_array_free (ret, TRUE); - } - else - { - dbus_g_method_return_error (context, error); - g_error_free (error); - } + tp_svc_channel_type_text_return_from_get_message_types (context, + mixin->priv->msg_types); } /** |