Merge pull request #564 from nurupo/friendstatus-patch

Removed friendstatus from client-side API, replacing it with alternative functions

1 files changed, 11 insertions, 9 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index ff2c31aa..07893e02 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -275,18 +275,20 @@ int m_delfriend(Messenger *m, int friendnumber)
     return 0;
 }
 
-/*  return FRIEND_ONLINE if friend is online.
- *  return FRIEND_CONFIRMED if friend is confirmed.
- *  return FRIEND_REQUESTED if the friend request was sent.
- *  return FRIEND_ADDED if the friend was added.
- *  return NOFRIEND if there is no friend with that number.
- */
-int m_friendstatus(Messenger *m, int friendnumber)
+int m_get_friend_connectionstatus(Messenger *m, int friendnumber)
+{
+    if (friend_not_valid(m, friendnumber))
+        return -1;
+
+    return m->friendlist[friendnumber].status == FRIEND_ONLINE;
+}
+
+int m_friend_exists(Messenger *m, int friendnumber)
 {
     if (friend_not_valid(m, friendnumber))
-        return NOFRIEND;
+        return 0;
 
-    return m->friendlist[friendnumber].status;
+    return m->friendlist[friendnumber].status > NOFRIEND;
 }
 
 /* Send a text chat message to an online friend.