Merge branch 'master' of https://github.com/blackwolf12333/ProjectTox-Core into blackwolf12333-master

Also fixed his pull request.

1 files changed, 5 insertions, 0 deletions

diff --git a/core/Messenger.h b/core/Messenger.h
index 7263901c..6ab50175 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -92,6 +92,11 @@ int m_sendmessage(int friendnumber, uint8_t *message, uint32_t length);
    return -1 if failure */
 int setname(uint8_t *name, uint16_t length);
 
+/* get our nickname
+   put it in name 
+   return the length of the name*/
+uint16_t getself_name(uint8_t *name);
+
 /* get name of friendnumber
     put it in name
     name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH (128) bytes.