[empathy] Drop tp_contact_factory_update_location for code readability
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Subject: [empathy] Drop tp_contact_factory_update_location for code readability
- Date: Sat, 9 May 2009 17:22:59 -0400 (EDT)
commit ef63fc4cdc7bda74694a8a2af379e4c060a82e79
Author: Pierre-Luc Beaudoin <pierre-luc pierlux com>
Date: Sat May 9 16:42:12 2009 -0400
Drop tp_contact_factory_update_location for code readability
This function is an artefact from previous version of this functionality
---
libempathy/empathy-tp-contact-factory.c | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index 4ab5fd4..0a118d6 100644
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -315,21 +315,6 @@ tp_contact_factory_avatar_updated_cb (TpConnection *connection,
}
static void
-tp_contact_factory_update_location (EmpathyTpContactFactory *tp_factory,
- guint handle,
- GHashTable *location)
-{
- EmpathyContact *contact;
-
- contact = tp_contact_factory_find_by_handle (tp_factory, handle);
- if (contact == NULL) {
- return;
- }
-
- empathy_contact_set_location (contact, location);
-}
-
-static void
tp_contact_factory_update_capabilities (EmpathyTpContactFactory *tp_factory,
guint handle,
const gchar *channel_type,
@@ -424,12 +409,14 @@ tp_contact_factory_got_locations (TpProxy *tp_proxy,
g_hash_table_iter_init (&iter, locations);
while (g_hash_table_iter_next (&iter, &key, &value)) {
- guint handle = GPOINTER_TO_INT (key);
- GHashTable *location = value;
+ guint handle = GPOINTER_TO_INT (key);
+ GHashTable *location = value;
+ EmpathyContact *contact;
- tp_contact_factory_update_location (tp_factory,
- handle,
- location);
+ contact = tp_contact_factory_find_by_handle (tp_factory, handle);
+ if (contact != NULL) {
+ empathy_contact_set_location (contact, location);
+ }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]