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

diff --git a/ChangeLog b/ChangeLog
index c0bc7249ffddb0a2e6fcd278e2914f650b4b774e..46b70860f354fac4aaa9275cac3a43283dacc014 100644 (file)
--- 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 1ffab9ecd2d27a8078ed40aacc43824e710cd4c3..1ba361d17302110ff7d2f45b1957da6d16254aaf 100644 (file)
--- 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 2d10642e1a6ceb18631fa421b1e3249842c05973..a8831a9714df7cf5e44df241fd58d592b112b667 100644 (file)
--- 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);