Merge branch 'new_api' of https://github.com/dubslow/toxcore into new_api

2 files changed, 9 insertions, 1 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 17cfd182..6427d435 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1003,7 +1003,7 @@ void callback_file_data(Messenger *m, void (*function)(Messenger *m, uint32_t, u
  *  return 0 on failure
  */
 static int file_sendrequest(const Messenger *m, int32_t friendnumber, uint8_t filenumber, uint64_t filesize,
-                     const uint8_t *filename, uint16_t filename_length)
+                            const uint8_t *filename, uint16_t filename_length)
 {
     if (friend_not_valid(m, friendnumber))
         return 0;
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 2acc70ea..abae26e6 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -444,6 +444,14 @@ enum TOX_ERR_NEW {
      */
     TOX_ERR_NEW_LOAD_ENCRYPTED,
     /**
+     * The encrypted byte array could not be decrypted. Either the data was
+     * corrupt or the password/key was incorrect.
+     *
+     * NOTE: This error code is only set by tox_encrypted_new() and
+     * tox_encrypted_key_new(), in the toxencryptsave module.
+     */
+    TOX_ERR_NEW_LOAD_DECRYPTION_FAILED,
+    /**
      * The data format was invalid. This can happen when loading data that was
      * saved by an older version of Tox, or when the data has been corrupted.
      * When loading from badly formatted data, some data may have been loaded,