3 files changed, 10 insertions, 5 deletions
diff --git a/src/irc.c b/src/irc.c
index 3a7d901..5bdb5f0 100644
--- a/src/irc.c
+++ b/src/irc.c
@@ -206,8 +206,10 @@ static void do_ctcp(int is_notice) {
 		}
 
 		txbuf_set_str3("NOTICE ", msg_src, " :\x01");
-		txbuf_append_str3(ctcp_type, " ", resp);
-		txbuf_append_str("\x01");
+		txbuf_append_str(ctcp_type);
+		txbuf_append_chr(' ');
+		txbuf_append_str(resp);
+		txbuf_append_str('\x01');
 		txbuf_send();
 	}
 }
@@ -251,11 +253,10 @@ static void do_notice(void) {
 static void do_join(void) {
 	ind_act_join();
 	if(streq_i(conf->nick, msg_src)) {
-		scr_print_active("You have ");
+		scr_print_active("You ");
 	} else {
 		scr_print_active("\x02=\x02");
 		scr_print_active(msg_src);
-		scr_print_active(" has ");
 	}
 	scr_print_active("joined ");
 	scr_print_active(msg_dest);
diff --git a/src/irc.h b/src/irc.h
index 5a7e08d..05a0441 100644
--- a/src/irc.h
+++ b/src/irc.h
@@ -17,10 +17,12 @@ extern char *tx_buf;
 /* clears the transmit buffer. */
 void txbuf_init(void);
 
+void txbuf_append_chr(char c);
+
 /* appends a string to the transmit buffer, updates txbuflen. */
 void txbuf_append_str(const char *str);
 void txbuf_append_str2(const char *s1, const char *s2);
-void txbuf_append_str3(const char *s1, const char *s2, const char *s3);
+// void txbuf_append_str3(const char *s1, const char *s2, const char *s3);
 
 /* clears the transmit buffer, then appends a string to it. */
 void txbuf_set_str(const char *str);
diff --git a/src/main.c b/src/main.c
index 8b6fc28..ed84670 100644
--- a/src/main.c
+++ b/src/main.c
@@ -49,11 +49,13 @@ void txbuf_append_str2(const char *s1, const char *s2) {
 	txbuf_append_str(s2);
 }
 
+/*
 void txbuf_append_str3(const char *s1, const char *s2, const char *s3) {
 	txbuf_append_str(s1);
 	txbuf_append_str(s2);
 	txbuf_append_str(s3);
 }
+*/
 
 void txbuf_set_str(const char *str) {
 	txbuf_init();