From 44d9f7fe61534fa8dd7d7f4539b9877a82d6fd8d Mon Sep 17 00:00:00 2001
From: Jfreegman <Jfreegman@gmail.com>
Date: Mon, 9 Dec 2013 19:25:09 -0500
Subject: [PATCH] busy status mutes beeping

---
 src/chat.c       | 3 +--
 src/misc_tools.c | 8 ++++++--
 src/prompt.c     | 1 -
 src/prompt.h     | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/chat.c b/src/chat.c
index 14488bb..cfc813b 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -21,7 +21,7 @@ extern int store_data(Tox *m, char *path);
 extern FileSender file_senders[MAX_FILES];
 extern ToxicFriend friends[MAX_FRIENDS_NUM];
 
-#define AC_NUM_CHAT_COMMANDS 18
+#define AC_NUM_CHAT_COMMANDS 17
 
 /* Array of chat command names used for tab completion. */
 static const uint8_t chat_cmd_list[AC_NUM_CHAT_COMMANDS][MAX_CMDNAME_SIZE] = {
@@ -38,7 +38,6 @@ static const uint8_t chat_cmd_list[AC_NUM_CHAT_COMMANDS][MAX_CMDNAME_SIZE] = {
     { "/myid"       },
     { "/nick"       },
     { "/note"       },
-    { "/q"          },
     { "/quit"       },
     { "/savefile"   },
     { "/sendfile"   },
diff --git a/src/misc_tools.c b/src/misc_tools.c
index 2cdb25c..9b6ce36 100644
--- a/src/misc_tools.c
+++ b/src/misc_tools.c
@@ -10,6 +10,8 @@
 #include "toxic_windows.h"
 #include "misc_tools.h"
 
+extern ToxWindow *prompt;
+
 // XXX: FIX
 unsigned char *hex_string_to_bin(char hex_string[])
 {
@@ -153,8 +155,10 @@ void alert_window(ToxWindow *self, int type, bool is_beep)
         self->alert2 = true;
         break;
     }
-    
-    if (is_beep)
+
+    StatusBar *stb = prompt->stb;
+
+    if (is_beep && stb->status != TOX_USERSTATUS_BUSY)
         beep();
 }
 
diff --git a/src/prompt.c b/src/prompt.c
index 816ef74..81fae71 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -32,7 +32,6 @@ const uint8_t glob_cmd_list[AC_NUM_GLOB_COMMANDS][MAX_CMDNAME_SIZE] = {
     { "/myid"       },
     { "/nick"       },
     { "/note"       },
-    { "/q"          },
     { "/quit"       },
     { "/status"     },
 };
diff --git a/src/prompt.h b/src/prompt.h
index dcf5105..7652503 100644
--- a/src/prompt.h
+++ b/src/prompt.h
@@ -7,7 +7,7 @@
 
 #define X_OFST 2    /* offset to account for prompt char */
 
-#define AC_NUM_GLOB_COMMANDS 15
+#define AC_NUM_GLOB_COMMANDS 14
 
 ToxWindow new_prompt(void);
 void prep_prompt_win(void);