3 files changed, 22 insertions, 22 deletions

diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 51542c6d..fa5d6890 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -55,7 +55,7 @@
  * networking_requesthandler and so cannot take a Messenger * */
 static Messenger *m;
 
-void print_request(uint8_t * public_key, uint8_t * data, uint16_t length)
+void print_request(uint8_t * public_key, uint8_t * data, uint16_t length, void* userdata)
 {
     printf("Friend request received from: \n");
     printf("ClientID: ");
@@ -80,7 +80,7 @@ void print_request(uint8_t * public_key, uint8_t * data, uint16_t length)
     }
 }
 
-void print_message(Messenger *m, int friendnumber, uint8_t * string, uint16_t length)
+void print_message(Messenger *m, int friendnumber, uint8_t * string, uint16_t length, void* userdata)
 {
     printf("Message with length %u received from %u: %s \n", length, friendnumber, string);
     m_sendmessage(m, friendnumber, (uint8_t*)"Test1", 6);
@@ -114,8 +114,8 @@ int main(int argc, char *argv[])
         fclose(file);
 
     }
-    m_callback_friendrequest(m, print_request);
-    m_callback_friendmessage(m, print_message);
+    m_callback_friendrequest(m, print_request, NULL);
+    m_callback_friendmessage(m, print_message, NULL);
 
     printf("OUR ID: ");
     uint32_t i;
diff --git a/testing/nTox.c b/testing/nTox.c
index 1322067e..59d1cbf6 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -336,7 +336,7 @@ void do_refresh()
     refresh();
 }
 
-void print_request(uint8_t *public_key, uint8_t *data, uint16_t length)
+void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata)
 {
     new_lines("[i] received friend request with message:");
     new_lines((char *)data);
@@ -349,12 +349,12 @@ void print_request(uint8_t *public_key, uint8_t *data, uint16_t length)
     do_refresh();
 }
 
-void print_message(Messenger *m, int friendnumber, uint8_t * string, uint16_t length)
+void print_message(Messenger *m, int friendnumber, uint8_t * string, uint16_t length, void* userdata)
 {
     new_lines(format_message(m, (char*)string, friendnumber));
 }
 
-void print_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length)
+void print_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
 {
     char name[MAX_NAME_LENGTH];
     if(getname(m, friendnumber, (uint8_t*)name) != -1) {
@@ -364,7 +364,7 @@ void print_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t
     }
 }
 
-void print_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length)
+void print_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
 {
     char name[MAX_NAME_LENGTH];
     if(getname(m, friendnumber, (uint8_t*)name) != -1) {
@@ -467,10 +467,10 @@ int main(int argc, char *argv[])
 
     load_key(m, filename);
 
-    m_callback_friendrequest(m, print_request);
-    m_callback_friendmessage(m, print_message);
-    m_callback_namechange(m, print_nickchange);
-    m_callback_statusmessage(m, print_statuschange);
+    m_callback_friendrequest(m, print_request, NULL);
+    m_callback_friendmessage(m, print_message, NULL);
+    m_callback_namechange(m, print_nickchange, NULL);
+    m_callback_statusmessage(m, print_statuschange, NULL);
 
     initscr();
     noecho();
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index c14dee1f..ad89b23c 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -46,7 +46,7 @@ int w_num;
 int active_window;
 
 /* CALLBACKS START */
-void on_request(uint8_t *public_key, uint8_t *data, uint16_t length)
+void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata)
 {
   int n = add_req(public_key);
   wprintw(prompt->window, "\nFriend request from:\n");
@@ -65,7 +65,7 @@ void on_request(uint8_t *public_key, uint8_t *data, uint16_t length)
   }
 }
 
-void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length)
+void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
 {
   int i;
   for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
@@ -74,7 +74,7 @@ void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length
   }
 }
 
-void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length)
+void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
 {
   int i;
   for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
@@ -83,7 +83,7 @@ void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length)
   }
 }
 
-void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length)
+void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
 {
   wprintw(prompt->window, "\n(nickchange) %d: %s\n", friendnumber, string);
   int i;
@@ -93,7 +93,7 @@ void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t len
   }
 }
 
-void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length)
+void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
 {
   wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
   int i;
@@ -134,11 +134,11 @@ static void init_tox()
   m = initMessenger();
 
   /* Callbacks */
-  m_callback_friendrequest(m, on_request);
-  m_callback_friendmessage(m, on_message);
-  m_callback_namechange(m, on_nickchange);
-  m_callback_statusmessage(m, on_statuschange);
-  m_callback_action(m, on_action);
+  m_callback_friendrequest(m, on_request, NULL);
+  m_callback_friendmessage(m, on_message, NULL);
+  m_callback_namechange(m, on_nickchange, NULL);
+  m_callback_statusmessage(m, on_statuschange, NULL);
+  m_callback_action(m, on_action, NULL);
 }
 
 #define MAXLINE 90    /* Approx max number of chars in a sever line (IP + port + key) */