1 files changed, 19 insertions, 60 deletions

diff --git a/src/gnunet_chat_handle.h b/src/gnunet_chat_handle.h
index b287336..a0f44e0 100644
--- a/src/gnunet_chat_handle.h
+++ b/src/gnunet_chat_handle.h
@@ -26,86 +26,45 @@
 #define GNUNET_CHAT_HANDLE_H_
 
 #include <gnunet/platform.h>
+#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_config.h>
 #include <gnunet/gnunet_container_lib.h>
 #include <gnunet/gnunet_arm_service.h>
 #include <gnunet/gnunet_fs_service.h>
 #include <gnunet/gnunet_messenger_service.h>
-#include <gnunet/gnunet_regex_service.h>
 #include <gnunet/gnunet_util_lib.h>
 
+#include "gnunet_chat_lib.h"
+
 struct GNUNET_CHAT_Handle
 {
   const struct GNUNET_CONFIGURATION_Handle* cfg;
 
-  struct {
-    /*
-     * feature: (automatically start required services)
-     */
-    struct GNUNET_ARM_Handle *arm;
-
-    /*
-     * required: (files can be uploaded/downloaded)
-     */
-    struct GNUNET_FS_Handle *fs;
-
-    /*
-     * required!
-     */
-    struct GNUNET_MESSENGER_Handle *messenger;
-  } handles;
-
-  struct {
-    struct GNUNET_CONTAINER_MultiShortmap *short_map;
-    struct GNUNET_CONTAINER_MultiHashMap *hash_map;
-  } contacts;
-
-  struct GNUNET_CONTAINER_MultiHashMap *groups;
-  struct GNUNET_CONTAINER_MultiHashMap *contexts;
-  struct GNUNET_CONTAINER_MultiHashMap *files;
-
   GNUNET_CHAT_ContextMessageCallback msg_cb;
   void *msg_cls;
 
   GNUNET_CHAT_WarningCallback warn_cb;
   void *warn_cls;
-};
-
-int
-handle_update_chat_contact (struct GNUNET_CHAT_Handle *handle,
-                            struct GNUNET_CHAT_Contact *chatContact,
-                            int removeContact);
-
-int
-handle_update_chat_group (struct GNUNET_CHAT_Handle *handle,
-                          struct GNUNET_CHAT_Group *chatGroup,
-                          int removeGroup);
 
-int
-handle_update_chat_context (struct GNUNET_CHAT_Handle *handle,
-                            struct GNUNET_CHAT_Context *context,
-                            int removeContext);
+  struct GNUNET_CONTAINER_MultiHashMap *files;
+  struct GNUNET_CONTAINER_MultiHashMap *contexts;
+  struct GNUNET_CONTAINER_MultiShortmap *contacts;
+  struct GNUNET_CONTAINER_MultiHashMap *groups;
 
-int
-handle_update_chat_file (struct GNUNET_CHAT_Handle *handle,
-                         struct GNUNET_CHAT_File *file,
-                         int removeFile);
+  struct GNUNET_ARM_Handle *arm;
+  struct GNUNET_FS_Handle *fs;
+  struct GNUNET_MESSENGER_Handle *messenger;
+};
 
-struct GNUNET_CHAT_Contact*
-handle_get_chat_contact (struct GNUNET_CHAT_Handle *handle,
-                         const struct GNUNET_MESSENGER_Contact *contact);
+struct GNUNET_CHAT_Handle*
+handle_create_from_config (const struct GNUNET_CONFIGURATION_Handle* cfg,
+                           const char* name,
+                           GNUNET_CHAT_ContextMessageCallback msg_cb,
+                           void *msg_cls,
+                           GNUNET_CHAT_WarningCallback warn_cb,
+                           void *warn_cls);
 
 void
-handle_set_chat_contact (struct GNUNET_CHAT_Handle *handle,
-                         const struct GNUNET_MESSENGER_Contact *contact,
-                         struct GNUNET_CHAT_Contact *chatContact);
-
-struct GNUNET_CHAT_Context*
-handle_get_chat_context (struct GNUNET_CHAT_Handle *handle,
-                         const struct GNUNET_HashCode *key);
-
-struct GNUNET_CHAT_File*
-handle_get_chat_file (struct GNUNET_CHAT_Handle *handle,
-                      const struct GNUNET_HashCode *hash);
+handle_destroy (struct GNUNET_CHAT_Handle* handle);
 
 #endif /* GNUNET_CHAT_HANDLE_H_ */