summary refs log tree commit diff stats
path: root/src/common/hexchat.h
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2014-12-31 03:34:55 -0500
committerTingPing <tingping@tingping.se>2014-12-31 03:56:36 -0500
commit9f7444baa2001616f227ba9a442be824a57e56b9 (patch)
tree3bf087644d0421eeb1de1dea75429095ba6feffd /src/common/hexchat.h
parentfef580ed7faaba17e2c8fea504b8587850502220 (diff)
Move userlist sorting to frontend
This Fixes possible crashes when the two
usertrees get out of sync and a double free occurs.

Also now requires restart to change sort orders.

Fixes #1252
Fixes #818 (probably)
Diffstat (limited to 'src/common/hexchat.h')
-rw-r--r--src/common/hexchat.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index dfb1c52f..a5b61a26 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -37,6 +37,7 @@
 #endif
 
 #include "history.h"
+#include "tree.h"
 
 #ifdef USE_OPENSSL
 #include <openssl/ssl.h>		  /* SSL_() */
@@ -369,8 +370,7 @@ typedef struct session
 	guint8 text_strip;
 
 	struct server *server;
-	void *usertree_alpha;			/* pure alphabetical tree */
-	void *usertree;					/* ordered with Ops first */
+	tree *usertree;					/* alphabetical tree */
 	struct User *me;					/* points to myself in the usertree */
 	char channel[CHANLEN];
 	char waitchannel[CHANLEN];		  /* waiting to join channel (/join sent) */