3 files changed, 36 insertions, 12 deletions

diff --git a/src/gnunet_chat_handle.c b/src/gnunet_chat_handle.c
index 45f7861..d23741b 100644
--- a/src/gnunet_chat_handle.c
+++ b/src/gnunet_chat_handle.c
@@ -28,7 +28,6 @@
 
 struct GNUNET_CHAT_Handle*
 handle_create_from_config (const struct GNUNET_CONFIGURATION_Handle* cfg,
-                           const char *directory,
                            GNUNET_CHAT_ContextMessageCallback msg_cb,
                            void *msg_cls)
 {
@@ -44,11 +43,40 @@ handle_create_from_config (const struct GNUNET_CONFIGURATION_Handle* cfg,
   handle->internal_head = NULL;
   handle->internal_tail = NULL;
 
-  if ((directory) &&
-      (GNUNET_YES == GNUNET_DISK_directory_test(directory, GNUNET_YES)))
-    handle->directory = GNUNET_strdup(directory);
-  else
+  handle->directory = NULL;
+
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename(cfg,
+                     GNUNET_MESSENGER_SERVICE_NAME,
+                     "MESSENGER_DIR",
+                     &(handle->directory)))
+  {
+    if (handle->directory)
+      GNUNET_free(handle->directory);
+
+    handle->directory = NULL;
+  }
+  else if ((GNUNET_YES != GNUNET_DISK_directory_test(handle->directory, GNUNET_YES)) &&
+           (GNUNET_OK != GNUNET_DISK_directory_create(handle->directory)))
+  {
+    GNUNET_free(handle->directory);
+
     handle->directory = NULL;
+  }
+
+  if (handle->directory)
+  {
+    char *chat_directory = NULL;
+    util_get_dirname(handle->directory, "chat", &chat_directory);
+
+    if ((GNUNET_YES != GNUNET_DISK_directory_test(chat_directory, GNUNET_YES)) &&
+        (GNUNET_OK != GNUNET_DISK_directory_create(chat_directory)))
+      GNUNET_free(chat_directory);
+    else
+    {
+      GNUNET_free(handle->directory);
+      handle->directory = chat_directory;
+    }
+  }
 
   handle->msg_cb = msg_cb;
   handle->msg_cls = msg_cls;
diff --git a/src/gnunet_chat_handle.h b/src/gnunet_chat_handle.h
index 28cfacc..5702206 100644
--- a/src/gnunet_chat_handle.h
+++ b/src/gnunet_chat_handle.h
@@ -122,7 +122,6 @@ struct GNUNET_CHAT_Handle
 
 struct GNUNET_CHAT_Handle*
 handle_create_from_config (const struct GNUNET_CONFIGURATION_Handle* cfg,
-                           const char *directory,
                            GNUNET_CHAT_ContextMessageCallback msg_cb,
                            void *msg_cls);
 
diff --git a/src/gnunet_chat_lib.c b/src/gnunet_chat_lib.c
index 1fcc419..72db7cd 100644
--- a/src/gnunet_chat_lib.c
+++ b/src/gnunet_chat_lib.c
@@ -47,7 +47,6 @@
 
 struct GNUNET_CHAT_Handle*
 GNUNET_CHAT_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                   const char *directory,
                    GNUNET_CHAT_ContextMessageCallback msg_cb, void *msg_cls)
 {
   GNUNET_CHAT_VERSION_ASSERT();
@@ -56,8 +55,9 @@ GNUNET_CHAT_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
     return NULL;
 
   return handle_create_from_config(
-      cfg, directory,
-      msg_cb, msg_cls
+      cfg,
+      msg_cb,
+      msg_cls
   );
 }
 
@@ -1094,9 +1094,6 @@ GNUNET_CHAT_context_send_file (struct GNUNET_CHAT_Context *context,
   if ((!context) || (!path) || (!(context->room)))
     return NULL;
 
-  if (!(context->handle->directory))
-    return NULL;
-
   struct GNUNET_HashCode hash;
   if (GNUNET_OK != util_hash_file(path, &hash))
     return NULL;