diff options
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-avatar.c | 6 | ||||
| -rw-r--r-- | libempathy/empathy-avatar.h | 3 | ||||
| -rw-r--r-- | libempathy/empathy-contact-factory.c | 13 | ||||
| -rw-r--r-- | libempathy/empathy-tp-group.c | 7 |
4 files changed, 23 insertions, 6 deletions
diff --git a/libempathy/empathy-avatar.c b/libempathy/empathy-avatar.c index fe4e613c6..136673110 100644 --- a/libempathy/empathy-avatar.c +++ b/libempathy/empathy-avatar.c @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Copyright (C) 2002-2007 Imendio AB + * Copyright (C) 2006 Xavier Claessens <xclaesse@gmail.com> + * Copyright (C) 2007 Collabora Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,8 +18,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * Authors: Martyn Russell <martyn@imendio.com> - * Xavier Claessens <xclaesse@gmail.com> + * Authors: Xavier Claessens <xclaesse@gmail.com> */ #include "config.h" diff --git a/libempathy/empathy-avatar.h b/libempathy/empathy-avatar.h index b3d69a8fe..390676a20 100644 --- a/libempathy/empathy-avatar.h +++ b/libempathy/empathy-avatar.h @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Copyright (C) 2006 Xavier Claessens <xclaesse@gmail.com> + * Copyright (C) 2007 Collabora Ltd. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -16,6 +17,8 @@ * License along with this program; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. + * + * Authors: Xavier Claessens <xclaesse@gmail.com> */ #ifndef __EMPATHY_AVATAR_H__ diff --git a/libempathy/empathy-contact-factory.c b/libempathy/empathy-contact-factory.c index e14914a1c..8f5c51a5c 100644 --- a/libempathy/empathy-contact-factory.c +++ b/libempathy/empathy-contact-factory.c @@ -213,6 +213,8 @@ contact_factory_get_presence_cb (DBusGProxy *proxy, g_hash_table_foreach (handle_table, (GHFunc) contact_factory_parse_presence_foreach, account_data); + + g_hash_table_destroy (handle_table); OUT: contact_factory_account_data_return_call (account_data); } @@ -229,8 +231,8 @@ contact_factory_presence_update_cb (DBusGProxy *proxy, static void contact_factory_set_aliases_cb (DBusGProxy *proxy, - GError *error, - gpointer user_data) + GError *error, + gpointer user_data) { ContactFactoryAccountData *account_data = user_data; @@ -276,6 +278,7 @@ contact_factory_request_aliases_cb (DBusGProxy *proxy, i++; } + g_strfreev (contact_names); OUT: contact_factory_account_data_return_call (data->account_data); g_free (data->handles); @@ -458,6 +461,7 @@ contact_factory_get_known_avatar_tokens_cb (DBusGProxy *proxy, account_data); } + g_hash_table_destroy (tokens); g_array_free (data.handles, TRUE); OUT: contact_factory_account_data_return_call (account_data); @@ -560,9 +564,11 @@ contact_factory_get_capabilities_cb (DBusGProxy *proxy, channel_type, generic, specific); - } + g_value_array_free (values); + } + g_ptr_array_free (capabilities, TRUE); OUT: contact_factory_account_data_return_call (account_data); } @@ -668,6 +674,7 @@ contact_factory_request_handles_cb (DBusGProxy *proxy, } contact_factory_request_everything (data->account_data, handles); + g_array_free (handles, TRUE); OUT: g_list_foreach (data->contacts, (GFunc) g_object_unref, NULL); diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c index 1ba361d17..c4f7583e9 100644 --- a/libempathy/empathy-tp-group.c +++ b/libempathy/empathy-tp-group.c @@ -370,6 +370,8 @@ tp_group_get_members_cb (DBusGProxy *proxy, 0, /* actor */ 0, /* reason */ group); + + g_array_free (handles, TRUE); } static void @@ -413,7 +415,10 @@ tp_group_get_local_pending_cb (DBusGProxy *proxy, actor_handle, /* actor */ reason, /* reason */ group); + + g_value_array_free (pending_struct); } + g_ptr_array_free (array, TRUE); g_array_free (handles, TRUE); } @@ -441,6 +446,8 @@ tp_group_get_remote_pending_cb (DBusGProxy *proxy, 0, /* actor */ 0, /* reason */ group); + + g_array_free (handles, TRUE); } static void |