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

2 files changed, 9 insertions, 9 deletions

diff --git a/toxcore/tox.c b/toxcore/tox.c
index f547c402..73007c72 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -319,7 +319,7 @@ bool tox_add_tcp_relay(Tox *tox, const char *address, uint16_t port, const uint8
     return 1;
 }
 
-TOX_CONNECTION tox_get_connection_status(const Tox *tox)
+TOX_CONNECTION tox_self_get_connection_status(const Tox *tox)
 {
     const Messenger *m = tox;
 
@@ -335,7 +335,7 @@ TOX_CONNECTION tox_get_connection_status(const Tox *tox)
 }
 
 
-void tox_callback_connection_status(Tox *tox, tox_connection_status_cb *function, void *user_data)
+void tox_callback_self_connection_status(Tox *tox, tox_self_connection_status_cb *function, void *user_data)
 {
     Messenger *m = tox;
     m_callback_core_connection(m, function, user_data);
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 0df75976..eec41fc7 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -642,20 +642,20 @@ typedef enum TOX_CONNECTION {
 
 /**
  * Return whether we are connected to the DHT. The return value is equal to the
- * last value received through the `connection_status` callback.
+ * last value received through the `self_connection_status` callback.
  */
-TOX_CONNECTION tox_get_connection_status(const Tox *tox);
+TOX_CONNECTION tox_self_get_connection_status(const Tox *tox);
 
 /**
- * The function type for the `connection_status` callback.
+ * The function type for the `self_connection_status` callback.
  *
  * @param connection_status Equal to the return value of
- *   tox_get_connection_status.
+ *   tox_self_get_connection_status.
  */
-typedef void tox_connection_status_cb(Tox *tox, TOX_CONNECTION connection_status, void *user_data);
+typedef void tox_self_connection_status_cb(Tox *tox, TOX_CONNECTION connection_status, void *user_data);
 
 /**
- * Set the callback for the `connection_status` event. Pass NULL to unset.
+ * Set the callback for the `self_connection_status` event. Pass NULL to unset.
  *
  * This event is triggered whenever there is a change in the DHT connection
  * state. When disconnected, a client may choose to call tox_bootstrap again, to
@@ -665,7 +665,7 @@ typedef void tox_connection_status_cb(Tox *tox, TOX_CONNECTION connection_status
  *
  * TODO: how long should a client wait before bootstrapping again?
  */
-void tox_callback_connection_status(Tox *tox, tox_connection_status_cb *function, void *user_data);
+void tox_callback_self_connection_status(Tox *tox, tox_self_connection_status_cb *function, void *user_data);
 
 
 /**