diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-05-20 04:19:42 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-05-20 04:19:42 +0800 |
| commit | 1ff555e581a89646fa252706d41ae822d1e023e4 (patch) | |
| tree | d0ebda452d5b20b35de7b15fba8d686b0f8e2308 /libempathy | |
| parent | 6289d5e8af55efe139fa3981e11684b8a0784549 (diff) | |
| download | gsoc2013-empathy-1ff555e581a89646fa252706d41ae822d1e023e4.tar gsoc2013-empathy-1ff555e581a89646fa252706d41ae822d1e023e4.tar.gz gsoc2013-empathy-1ff555e581a89646fa252706d41ae822d1e023e4.tar.bz2 gsoc2013-empathy-1ff555e581a89646fa252706d41ae822d1e023e4.tar.lz gsoc2013-empathy-1ff555e581a89646fa252706d41ae822d1e023e4.tar.xz gsoc2013-empathy-1ff555e581a89646fa252706d41ae822d1e023e4.tar.zst gsoc2013-empathy-1ff555e581a89646fa252706d41ae822d1e023e4.zip | |
Fix indentation Fix not returning the contact in tp_contact_list_find()
2007-05-19 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/Makefile.am:
* libempathy/empathy-tp-chat.c:
* libempathy/empathy-contact-manager.c:
* libempathy/empathy-contact-list.c: Fix indentation
* libempathy/empathy-tp-contact-list.c: Fix not returning the contact
in tp_contact_list_find()
* TODO: Updated.
svn path=/trunk/; revision=75
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-contact-list.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-contact-manager.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-tp-contact-list.c | 9 |
4 files changed, 6 insertions, 9 deletions
diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c index f763cdb60..b7d02010b 100644 --- a/libempathy/empathy-contact-list.c +++ b/libempathy/empathy-contact-list.c @@ -86,7 +86,7 @@ empathy_contact_list_setup (EmpathyContactList *list) GossipContact * empathy_contact_list_find (EmpathyContactList *list, - const gchar *id) + const gchar *id) { g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL); diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c index a4cae35c7..fa62da98f 100644 --- a/libempathy/empathy-contact-manager.c +++ b/libempathy/empathy-contact-manager.c @@ -397,7 +397,7 @@ contact_manager_find_foreach (McAccount *account, { data->contact = empathy_contact_list_find (EMPATHY_CONTACT_LIST (list), data->id); - + if (data->contact) { return TRUE; } diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 73f60491c..8e8a52aca 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -232,7 +232,7 @@ tp_chat_constructor (GType type, chat = G_OBJECT_CLASS (empathy_tp_chat_parent_class)->constructor (type, n_props, props); priv = GET_PRIV (chat); -g_print ("**********tp_chat_constructor"); + priv->manager = empathy_contact_manager_new (); priv->list = empathy_contact_manager_get_list (priv->manager, priv->account); priv->mc = gossip_mission_control_new (); diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index 43c317e00..60a7fd535 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -447,17 +447,14 @@ tp_contact_list_find (EmpathyContactList *list, const gchar *id) { EmpathyTpContactListPriv *priv; - GossipContact *contact; g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL); priv = GET_PRIV (list); - contact = g_hash_table_find (priv->contacts, - (GHRFunc) tp_contact_list_find_foreach, - (gchar*) id); - - return NULL; + return g_hash_table_find (priv->contacts, + (GHRFunc) tp_contact_list_find_foreach, + (gchar*) id); } static void |