[Telepathy-commits] [telepathy-gabble/master] rename gabble_olpc_gadget_manager_find_buddy_properties_from_views to gabble_olpc_gadget_manager_find_buddy_properties

[Guillaume Desmottes]

---
 src/conn-olpc.c           |    2 +-
 src/olpc-gadget-manager.c |    2 +-
 src/olpc-gadget-manager.h |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/conn-olpc.c b/src/conn-olpc.c
index 818d732..8a8c289 100644
--- a/src/conn-olpc.c
+++ b/src/conn-olpc.c
@@ -439,7 +439,7 @@ olpc_buddy_info_get_properties (GabbleSvcOLPCBuddyInfo *iface,
   /* First check if we can find properties in a buddy view */
   /* FIXME: Maybe we should first try the PEP node as we do for buddy
    * activities ? */
-  properties = gabble_olpc_gadget_manager_find_buddy_properties_from_views (
+  properties = gabble_olpc_gadget_manager_find_buddy_properties (
       conn->olpc_gadget_manager, contact);
   if (properties != NULL)
     {
diff --git a/src/olpc-gadget-manager.c b/src/olpc-gadget-manager.c
index 18fbd13..769071e 100644
--- a/src/olpc-gadget-manager.c
+++ b/src/olpc-gadget-manager.c
@@ -545,7 +545,7 @@ find_view_having_properties_for_buddy (gpointer id,
 }
 
 GHashTable *
-gabble_olpc_gadget_manager_find_buddy_properties_from_views (
+gabble_olpc_gadget_manager_find_buddy_properties (
     GabbleOlpcGadgetManager *self,
     TpHandle buddy)
 {
diff --git a/src/olpc-gadget-manager.h b/src/olpc-gadget-manager.h
index 4b9df38..5e05b3d 100644
--- a/src/olpc-gadget-manager.h
+++ b/src/olpc-gadget-manager.h
@@ -59,8 +59,7 @@ GType gabble_olpc_gadget_manager_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_OLPC_GADGET_MANAGER,\
                               GabbleOlpcGadgetManagerClass))
 
-/* TODO: remove the _from_views */
-GHashTable * gabble_olpc_gadget_manager_find_buddy_properties_from_views (
+GHashTable * gabble_olpc_gadget_manager_find_buddy_properties (
     GabbleOlpcGadgetManager *self, TpHandle buddy);
 
 GabbleOlpcView * gabble_olpc_gadget_manager_get_view (
-- 
1.5.6.5