WIP

2 files changed, 8 insertions, 5 deletions

diff --git a/tubes/inc/tubes/contact-list.hxx b/tubes/inc/tubes/contact-list.hxx
index bf1e0f79d149..a17b1103d96f 100644
--- a/tubes/inc/tubes/contact-list.hxx
+++ b/tubes/inc/tubes/contact-list.hxx
@@ -42,12 +42,9 @@ typedef ::std::vector< AccountContactPair > AccountContactPairV;
 class TUBES_DLLPUBLIC ContactList
 {
 public:
-    ContactList();
+    ContactList(TpAccountManager *pAccountManager);
     ~ContactList();
 
-    typedef void (*PrepareCallback)( GError *errorOr0, void *user_data );
-    void                    prepare( PrepareCallback callback, void *user_data );
-
     AccountContactPairV     getContacts();
 
 private:
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index aa6a027726af..3d557ad5b458 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -33,6 +33,7 @@
 #include "tubes/tubesdllapi.h"
 #include "tubes/conference.hxx"
 #include "tubes/packet.hxx"
+#include "tubes/contact-list.hxx"
 #include <rtl/ustring.hxx>
 #include <salhelper/thread.hxx>
 #include <rtl/ref.hxx>
@@ -82,7 +83,7 @@ public:
     TeleManager( const Link& rLink, bool bCreateOwnGMainLoop = false );
     ~TeleManager();
 
-    /** Prepare the Telepathy Account Manager.
+    /** Prepare the Telepathy Account Manager. Requires connect() to have succeeded.
 
         Invokes an async call that is not ready until meAccountManagerStatus is
         set! Until that is AMS_PREPARED nothing else will work.
@@ -92,6 +93,11 @@ public:
     void                    prepareAccountManager();
     AccountManagerStatus    getAccountManagerStatus() const;
 
+    /** Fetches the contact list. Returns 0 before connect() is called successfully.
+        Is non-functional until prepareAccountManager().
+     */
+    ContactList*            getContactList();
+
 #if 0
     /** Start a group session in a MUC.