From 1ed6d83ed33daea4a70c34889605f66259820d99 Mon Sep 17 00:00:00 2001
From: Jfreegman <Jfreegman@gmail.com>
Date: Sun, 17 Nov 2013 23:14:27 -0500
Subject: [PATCH] show name for default friend request message. also don't
 print key.

---
 src/friendlist.c      |  4 ++--
 src/global_commands.c | 17 ++++++++++-------
 src/prompt.c          |  8 +-------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/friendlist.c b/src/friendlist.c
index aa3c45f..4192e35 100644
--- a/src/friendlist.c
+++ b/src/friendlist.c
@@ -177,7 +177,8 @@ static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key)
     max_friends_index = i;
     --num_friends;
 
-    if (num_selected == num_friends)
+    /* make sure num_selected stays within num_friends range */
+    if (num_friends && num_selected == num_friends)
         --num_selected;
 
     sort_friendlist_index();
@@ -204,7 +205,6 @@ static void friendlist_onKey(ToxWindow *self, Tox *m, wint_t key)
     } else {
         select_friend(m, key);
     }
-
 }
 
 static void friendlist_onDraw(ToxWindow *self, Tox *m)
diff --git a/src/global_commands.c b/src/global_commands.c
index 4ad1ed9..7ae9d64 100644
--- a/src/global_commands.c
+++ b/src/global_commands.c
@@ -68,20 +68,23 @@ void cmd_add(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int argc, char
     }
 
     char *id = argv[1];
-    uint8_t *msg;
+    uint8_t msg[MAX_STR_SIZE];
 
     if (argc > 1) {
-        msg = argv[2];
+        uint8_t *temp = argv[2];
 
-        if (msg[0] != '\"') {
+        if (temp[0] != '\"') {
             wprintw(window, "Message must be enclosed in quotes.\n");
             return;
         }
 
-        msg[strlen(++msg)-1] = L'\0';
-
-    } else
-        msg = "Let's tox.";
+        temp[strlen(++temp)-1] = L'\0';
+        snprintf(msg, sizeof(msg), "%s", temp);
+    } else {
+        uint8_t selfname[TOX_MAX_NAME_LENGTH];
+        tox_getselfname(m, selfname, TOX_MAX_NAME_LENGTH);
+        snprintf(msg, sizeof(msg), "Hello, my name is %s. Care to Tox?", selfname);
+    }
 
     if (strlen(id) != 2 * TOX_FRIEND_ADDRESS_SIZE) {
         wprintw(window, "Invalid ID length.\n");
diff --git a/src/prompt.c b/src/prompt.c
index 69e4820..422b1e2 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -217,14 +217,8 @@ static void prompt_onConnectionChange(ToxWindow *self, Tox *m, int friendnum , u
 
 static void prompt_onFriendRequest(ToxWindow *self, uint8_t *key, uint8_t *data, uint16_t length)
 {
-    wprintw(self->window, "\nFriend request from:\n");
-    int i;
+    wprintw(self->window, "\nFriend request with the message: %s\n", data);
 
-    for (i = 0; i < KEY_SIZE_BYTES; ++i) {
-        wprintw(self->window, "%02x", key[i] & 0xff);
-    }
-
-    wprintw(self->window, "\n\nWith the message: %s\n\n", data);
     int n = add_friend_request(key);
 
     if (n == -1) {