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

Also fixed his pull request.

1 files changed, 9 insertions, 0 deletions

diff --git a/core/Messenger.c b/core/Messenger.c
index 4c76dd30..3a287363 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -240,6 +240,15 @@ int setname(uint8_t * name, uint16_t length)
     return 0;
 }
 
+/* get our nickname
+   put it in name 
+   return the length of the name */
+uint16_t getself_name(uint8_t *name)
+{
+    memcpy(name, self_name, self_name_length);
+    return self_name_length;
+} 
+
 /* 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 bytes.