Merge branch 'master' of https://github.com/stqism/ProjectTox-Core into pull-requests

Conflicts:
	testing/toxic/prompt.c

3 files changed, 12 insertions, 2 deletions

diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index bd213131..b870e9c2 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -57,7 +57,6 @@ static void chat_onMessage(ToxWindow *self, int num, uint8_t *msg, uint16_t len)
 
   self->blink = true;
   beep();
-  flash();
 }
 
 static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t len)
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 8de76244..27e3d858 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -22,6 +22,7 @@ extern int add_req(uint8_t *public_key); // XXX
 
 /* Holds status of chat windows */
 char WINDOW_STATUS[MAX_WINDOW_SLOTS];
+#define TOXICVER "0.1.0" //Will be moved to a -D flag later 
 
 static ToxWindow windows[MAX_WINDOW_SLOTS];
 static ToxWindow* prompt;
@@ -258,7 +259,7 @@ static void draw_bar()
   move(LINES - 1, 0);
 
   attron(COLOR_PAIR(4) | A_BOLD);
-  printw(" TOXIC 1.0 |");
+  printw(" TOXIC " TOXICVER " |"); 
   attroff(COLOR_PAIR(4) | A_BOLD);
 
   int i;
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 0bdf69fb..486273d3 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -62,6 +62,16 @@ static void execute(ToxWindow *self, char *u_cmd)
     if (!isspace(cmd[cmd_end]))
       break;
   cmd[cmd_end + 1] = '\0';
+  
+/* What is this supposed to do?
+  if (cmd[0] == '/') {
+    wprintw(self->window,"Warning: Run your command without the /, this may not work\n");
+    int i;
+    for (i = 1; i < strlen(cmd); i++) { //This doesn't work when it doesn't end with a space and another word
+      cmd[i - 1] = cmd[i]; //Still working on why
+    }
+  }
+*/
 
   if (!strcmp(cmd, "quit") || !strcmp(cmd, "exit") || !strcmp(cmd, "q")) {
     endwin();