diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-10-12 10:24:57 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-10-12 10:24:57 +0100 |
| commit | fd25b9eced97e819322c9eba8505646cb2258f65 (patch) | |
| tree | d182afa72c86376f7e8a01b90a1232836862d8c5 | |
| parent | c4840088b5d8a0586a3753f87e60c1a1cbd08bab (diff) | |
| parent | 8104691233d634225a8351e0feb8e42c6386c446 (diff) | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | telepathy-glib/util.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/telepathy-glib/util.c b/telepathy-glib/util.c index 9f26c3ca..068112db 100644 --- a/telepathy-glib/util.c +++ b/telepathy-glib/util.c @@ -2009,7 +2009,7 @@ _tp_contacts_to_handles (TpConnection *connection, } /* table's key can be anything (usually TpHandle) but value must be a - * GObject (usually TpContact) */ + * TpContact */ GPtrArray * _tp_contacts_from_values (GHashTable *table) { @@ -2026,7 +2026,10 @@ _tp_contacts_from_values (GHashTable *table) g_hash_table_iter_init (&iter, table); while (g_hash_table_iter_next (&iter, NULL, &value)) { - g_assert (G_IS_OBJECT (value)); + if (value == NULL) + continue; + g_assert (TP_IS_CONTACT (value)); + g_ptr_array_add (contacts, g_object_ref (value)); } |