aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-09-28 16:16:32 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-09-28 16:16:32 +0800
commit11ae12abf0ac6bb90e5eabb2d205235b0ed08606 (patch)
tree14ef08ce2452406d87f9515479cb9f5099107b2f
parentac2baa625e8c0bcb57a8ceec4d34d046135b0171 (diff)
downloadgsoc2013-empathy-11ae12abf0ac6bb90e5eabb2d205235b0ed08606.tar
gsoc2013-empathy-11ae12abf0ac6bb90e5eabb2d205235b0ed08606.tar.gz
gsoc2013-empathy-11ae12abf0ac6bb90e5eabb2d205235b0ed08606.tar.bz2
gsoc2013-empathy-11ae12abf0ac6bb90e5eabb2d205235b0ed08606.tar.lz
gsoc2013-empathy-11ae12abf0ac6bb90e5eabb2d205235b0ed08606.tar.xz
gsoc2013-empathy-11ae12abf0ac6bb90e5eabb2d205235b0ed08606.tar.zst
gsoc2013-empathy-11ae12abf0ac6bb90e5eabb2d205235b0ed08606.zip
Look in the local_pendings list if a contact is already local pending. Fix
2007-09-28 Xavier Claessens <xclaesse@gmail.com> * libempathy/empathy-tp-group.c: Look in the local_pendings list if a contact is already local pending. * tests/contact-manager.c: Fix white space typo. svn path=/trunk/; revision=326
-rw-r--r--ChangeLog6
-rw-r--r--libempathy/empathy-tp-group.c2
-rw-r--r--tests/contact-manager.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c0bc7249f..46b70860f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-28 Xavier Claessens <xclaesse@gmail.com>
+
+ * libempathy/empathy-tp-group.c: Look in the local_pendings list if a
+ contact is already local pending.
+ * tests/contact-manager.c: Fix white space typo.
+
2007-09-27 Xavier Claessens <xclaesse@gmail.com>
* libempathy/empathy-utils.c:
diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c
index 1ffab9ecd..1ba361d17 100644
--- a/libempathy/empathy-tp-group.c
+++ b/libempathy/empathy-tp-group.c
@@ -256,7 +256,7 @@ tp_group_members_changed_cb (DBusGProxy *group_iface,
contacts = tp_group_get_contacts (group, local_pending);
for (l = contacts; l; l = l->next) {
/* If the contact is not yet local-pending, add it and emit signal */
- if (!g_list_find_custom (priv->members, l->data,
+ if (!g_list_find_custom (priv->local_pendings, l->data,
tp_group_local_pending_find)) {
EmpathyPendingInfo *info;
diff --git a/tests/contact-manager.c b/tests/contact-manager.c
index 2d10642e1..a8831a971 100644
--- a/tests/contact-manager.c
+++ b/tests/contact-manager.c
@@ -21,11 +21,11 @@ main (int argc, char **argv)
main_loop = g_main_loop_new (NULL, FALSE);
manager = empathy_contact_manager_new ();
-
+
g_timeout_add (5000, time_out, main_loop);
g_main_loop_run (main_loop);
-
+
g_object_unref (manager);
g_main_loop_unref (main_loop);