projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Irssi 0.8.16-rc1
[silc.git]
/
apps
/
irssi
/
src
/
core
/
nicklist.h
diff --git
a/apps/irssi/src/core/nicklist.h
b/apps/irssi/src/core/nicklist.h
index 78dabcc009bca2837f07884c0adeab4fc1ddfb84..55dfd5efcc6fa6d1ffab6c2ba04eb963110884af 100644
(file)
--- a/
apps/irssi/src/core/nicklist.h
+++ b/
apps/irssi/src/core/nicklist.h
@@
-8,6
+8,8
@@
#define IS_NICK(server) \
(NICK(server) ? TRUE : FALSE)
#define IS_NICK(server) \
(NICK(server) ? TRUE : FALSE)
+#define MAX_USER_PREFIXES 7 /* Max prefixes kept for any user-in-chan. 7+1 is a memory unit */
+
struct _NICK_REC {
#include "nick-rec.h"
};
struct _NICK_REC {
#include "nick-rec.h"
};
@@
-48,10
+50,7
@@
void nicklist_update_flags_unique(SERVER_REC *server, void *id,
/* Specify which nick in channel is ours */
void nicklist_set_own(CHANNEL_REC *channel, NICK_REC *nick);
/* Specify which nick in channel is ours */
void nicklist_set_own(CHANNEL_REC *channel, NICK_REC *nick);
-/* Nick record comparision for sort functions */
-#if GLIB_MAJOR_VERSION < 2
-int nicklist_compare_glib1(NICK_REC *p1, NICK_REC *p2);
-#endif
+/* Nick record comparison for sort functions */
int nicklist_compare(NICK_REC *p1, NICK_REC *p2, const char *nick_prefix);
/* Check is `msg' is meant for `nick'. */
int nicklist_compare(NICK_REC *p1, NICK_REC *p2, const char *nick_prefix);
/* Check is `msg' is meant for `nick'. */