10 files changed, 15 insertions, 16 deletions

diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index 6bd619c3..22a1354d 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -477,7 +477,7 @@ START_TEST(test_few_clients)
     ck_assert_msg(connected_t1, "Tox1 isn't connected. %u", connected_t1);
     printf("tox clients connected took %llu seconds\n", time(NULL) - con_time);
     to_compare = 974536;
-    tox_callback_friend_message(tox3, print_message, &to_compare);
+    tox_callback_friend_message(tox3, print_message);
     uint8_t msgs[TOX_MAX_MESSAGE_LENGTH + 1];
     memset(msgs, 'G', sizeof(msgs));
     TOX_ERR_FRIEND_SEND_MESSAGE errm;
diff --git a/other/apidsl/tox.in.h b/other/apidsl/tox.in.h
index c0695d54..bb97174a 100644
--- a/other/apidsl/tox.in.h
+++ b/other/apidsl/tox.in.h
@@ -1479,7 +1479,7 @@ namespace friend {
   /**
    * This event is triggered when a message from a friend is received.
    */
-  event message {
+  event message const {
     /**
      * @param friend_number The friend number of the friend who sent the message.
      * @param time_delta Time between composition and sending.
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 0c439a05..44b9fc48 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
     }
 
     m_callback_friendrequest(m, print_request, NULL);
-    m_callback_friendmessage(m, print_message, NULL);
+    m_callback_friendmessage(m, print_message);
 
     printf("OUR ID: ");
     uint32_t i;
diff --git a/testing/irc_syncbot.c b/testing/irc_syncbot.c
index be4cf620..8ee28d80 100644
--- a/testing/irc_syncbot.c
+++ b/testing/irc_syncbot.c
@@ -228,7 +228,7 @@ Tox *init_tox(int argc, char *argv[])
         exit(1);
 
     tox_self_set_name(tox, (uint8_t *)IRC_NAME, sizeof(IRC_NAME) - 1, 0);
-    tox_callback_friend_message(tox, &callback_friend_message, 0);
+    tox_callback_friend_message(tox, &callback_friend_message);
     tox_callback_group_invite(tox, &callback_group_invite, 0);
     tox_callback_group_message(tox, &copy_groupmessage, 0);
     tox_callback_group_action(tox, &copy_groupmessage, 0);
diff --git a/testing/nTox.c b/testing/nTox.c
index 5e70e728..8cc633bc 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -1291,7 +1291,7 @@ int main(int argc, char *argv[])
     save_data_file(m, filename);
 
     tox_callback_friend_request(m, print_request, NULL);
-    tox_callback_friend_message(m, print_message, NULL);
+    tox_callback_friend_message(m, print_message);
     tox_callback_friend_name(m, print_nickchange);
     tox_callback_friend_status_message(m, print_statuschange);
     tox_callback_group_invite(m, print_invite, NULL);
diff --git a/testing/tox_shell.c b/testing/tox_shell.c
index d045f798..9c71a2d7 100644
--- a/testing/tox_shell.c
+++ b/testing/tox_shell.c
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
 
     Tox *tox = tox_new(0, 0);
     tox_callback_friend_connection_status(tox, print_online, NULL);
-    tox_callback_friend_message(tox, print_message, master);
+    tox_callback_friend_message(tox, print_message);
 
 
     uint16_t port = atoi(argv[argvoffset + 2]);
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
             tox_friend_send_message(tox, num, TOX_MESSAGE_TYPE_NORMAL, buf, ret, 0);
         }
 
-        tox_iterate(tox, NULL);
+        tox_iterate(tox, master);
         c_sleep(1);
     }
 
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 2eb6cfd8..ac885310 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -771,10 +771,9 @@ void m_callback_friendrequest(Messenger *m, void (*function)(Messenger *m, const
 
 /* Set the function that will be executed when a message from a friend is received. */
 void m_callback_friendmessage(Messenger *m, void (*function)(Messenger *m, uint32_t, unsigned int, const uint8_t *,
-                              size_t, void *), void *userdata)
+                              size_t, void *))
 {
     m->friend_message = function;
-    m->friend_message_userdata = userdata;
 }
 
 void m_callback_namechange(Messenger *m, void (*function)(Messenger *m, uint32_t, const uint8_t *, size_t, void *))
@@ -2007,8 +2006,9 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len, void
             message_terminated[message_length] = 0;
             uint8_t type = packet_id - PACKET_ID_MESSAGE;
 
-            if (m->friend_message)
-                (*m->friend_message)(m, i, type, message_terminated, message_length, m->friend_message_userdata);
+            if (m->friend_message) {
+                (*m->friend_message)(m, i, type, message_terminated, message_length, userdata);
+            }
 
             break;
         }
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 113df796..2a421bba 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -237,7 +237,6 @@ struct Messenger {
     Node_format loaded_relays[NUM_SAVED_TCP_RELAYS]; // Relays loaded from config
 
     void (*friend_message)(struct Messenger *m, uint32_t, unsigned int, const uint8_t *, size_t, void *);
-    void *friend_message_userdata;
     void (*friend_namechange)(struct Messenger *m, uint32_t, const uint8_t *, size_t, void *);
     void (*friend_statusmessagechange)(struct Messenger *m, uint32_t, const uint8_t *, size_t, void *);
     void (*friend_userstatuschange)(struct Messenger *m, uint32_t, unsigned int, void *);
@@ -475,7 +474,7 @@ void m_callback_friendrequest(Messenger *m, void (*function)(Messenger *m, const
  *  Function format is: function(uint32_t friendnumber, unsigned int type, uint8_t * message, uint32_t length)
  */
 void m_callback_friendmessage(Messenger *m, void (*function)(Messenger *m, uint32_t, unsigned int, const uint8_t *,
-                              size_t, void *), void *userdata);
+                              size_t, void *));
 
 /* Set the callback for name changes.
  *  Function(uint32_t friendnumber, uint8_t *newname, size_t length)
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 6b36c115..2733a22f 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -902,10 +902,10 @@ void tox_callback_friend_request(Tox *tox, tox_friend_request_cb *function, void
     m_callback_friendrequest(m, function, user_data);
 }
 
-void tox_callback_friend_message(Tox *tox, tox_friend_message_cb *function, void *user_data)
+void tox_callback_friend_message(Tox *tox, tox_friend_message_cb *function)
 {
     Messenger *m = tox;
-    m_callback_friendmessage(m, function, user_data);
+    m_callback_friendmessage(m, function);
 }
 
 bool tox_hash(uint8_t *hash, const uint8_t *data, size_t length)
diff --git a/toxcore/tox.h b/toxcore/tox.h
index c2b14eec..dab8ac08 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -1580,7 +1580,7 @@ typedef void tox_friend_message_cb(Tox *tox, uint32_t friend_number, TOX_MESSAGE
  *
  * This event is triggered when a message from a friend is received.
  */
-void tox_callback_friend_message(Tox *tox, tox_friend_message_cb *callback, void *user_data);
+void tox_callback_friend_message(Tox *tox, tox_friend_message_cb *callback);
 
 
 /*******************************************************************************