hirc

commit 51156e19ca436a357fda547b99d54bf25eaf0451
parent cf034bb00c31c601e719624a4e01461f98490b95
Author: hhvn <dev@hhvn.uk>
Date:   Fri, 22 Apr 2022 17:03:11 +0100

Remove Activity_ignore, as it is equivalent to Activity_none

Diffstat:
M
src/chan.c
 | 
2
+-
M
src/hist.c
 | 
2
+-
M
src/main.c
 | 
2
+-
M
src/serv.c
 | 
2
+-
M
src/struct.h
 | 
4
++--

5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/chan.c b/src/chan.c
@@ -64,7 +64,7 @@ chan_create(struct Server *server, char *name, int priv) {
 	channel->priv = priv;
 	channel->server = server;
 	channel->history = emalloc(sizeof(struct HistInfo));
-	channel->history->activity = Activity_ignore;
+	channel->history->activity = Activity_none;
 	channel->history->unread = channel->history->ignored = 0;
 	channel->history->server = server;
 	channel->history->channel = channel;
diff --git a/src/hist.c b/src/hist.c
@@ -160,7 +160,7 @@ hist_add(struct HistInfo *histinfo,
 						options |= HIST_IGN;
 						new->options = options;
 					}
-					activity = Activity_ignore;
+					activity = Activity_none;
 					break;
 				}
 			}
diff --git a/src/main.c b/src/main.c
@@ -89,7 +89,7 @@ main(int argc, char *argv[]) {
 	}
 
 	main_buf = emalloc(sizeof(struct HistInfo));
-	main_buf->activity = Activity_ignore;
+	main_buf->activity = Activity_none;
 	main_buf->unread = main_buf->ignored = 0;
 	main_buf->server = NULL;
 	main_buf->channel = NULL;
diff --git a/src/serv.c b/src/serv.c
@@ -93,7 +93,7 @@ serv_create(char *name, char *host, char *port, char *nick,
 	server->self = nick_create(nick, ' ', NULL);
 	server->self->self = 1;
 	server->history = emalloc(sizeof(struct HistInfo));
-	server->history->activity = Activity_ignore;
+	server->history->activity = Activity_none;
 	server->history->unread = server->history->ignored = 0;
 	server->history->server = server;
 	server->history->channel = NULL;
diff --git a/src/struct.h b/src/struct.h
@@ -36,9 +36,9 @@ struct Nick {
 };
 
 enum Activity {
-	Activity_ignore = 0,
-	Activity_self = Activity_ignore,
+	/* There used to be an Activity_ignore = 0, but it served no purpose */
 	Activity_none = 1,
+	Activity_self = Activity_none,
 	Activity_status = 2,
 	Activity_notice = Activity_status,
 	Activity_error = 3,