diff options
| author | Timo Sirainen <cras@irssi.org> | 2001-11-01 22:52:23 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2001-11-01 22:52:23 +0000 |
| commit | 95b94ed83c1372fae4eb14bf8109847bdc65a8d2 (patch) | |
| tree | cf561053d2810f67121b624e8c2b9bdce902b69b /src/core | |
| parent | 9833844f38ccbb3a2679c99b4d9a6f9c2e1e5f8d (diff) | |
| download | irssi-95b94ed83c1372fae4eb14bf8109847bdc65a8d2.zip | |
server->ischannel(char *) -> server->ischannel(SERVER_REC *, char *). Added
#define server_ischannel(server, data) and it's now used everywhere..
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1954 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/chat-commands.c | 2 | ||||
| -rw-r--r-- | src/core/commands.c | 2 | ||||
| -rw-r--r-- | src/core/ignore.c | 2 | ||||
| -rw-r--r-- | src/core/server-rec.h | 2 | ||||
| -rw-r--r-- | src/core/servers.h | 3 |
5 files changed, 7 insertions, 4 deletions
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c index bdd64e4f..4a7b41ce 100644 --- a/src/core/chat-commands.c +++ b/src/core/chat-commands.c @@ -322,7 +322,7 @@ static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item) if (target != NULL) server->send_message(server, target, msg); - signal_emit(target != NULL && server->ischannel(target) ? + signal_emit(target != NULL && server_ischannel(server, target) ? "message own_public" : "message own_private", 4, server, msg, target, origtarget); diff --git a/src/core/commands.c b/src/core/commands.c index 0cbb70b0..46d0c666 100644 --- a/src/core/commands.c +++ b/src/core/commands.c @@ -636,7 +636,7 @@ static char *get_optional_channel(WI_ITEM_REC *active_item, char **data) channel = cmd_get_param(&tmp); if (strcmp(channel, "*") == 0 || - !active_item->server->ischannel(channel)) + !server_ischannel(active_item->server, channel)) ret = active_item->name; else { /* Find the channel first and use it's name if found. diff --git a/src/core/ignore.c b/src/core/ignore.c index f008df3f..d3f3f633 100644 --- a/src/core/ignore.c +++ b/src/core/ignore.c @@ -162,7 +162,7 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host, if (nick == NULL) nick = ""; chanrec = (channel != NULL && server != NULL && - server->ischannel(channel)) ? + server_ischannel(server, channel)) ? channel_find(server, channel) : NULL; if (chanrec != NULL && nick != NULL && (nickrec = nicklist_find(chanrec, nick)) != NULL) { diff --git a/src/core/server-rec.h b/src/core/server-rec.h index 7cdc66e5..4a75ef80 100644 --- a/src/core/server-rec.h +++ b/src/core/server-rec.h @@ -55,7 +55,7 @@ void (*channels_join)(SERVER_REC *server, const char *data, int automatic); /* returns true if `flag' indicates a nick flag (op/voice/halfop) */ int (*isnickflag)(char flag); /* returns true if `data' indicates a channel */ -int (*ischannel)(const char *data); +int (*ischannel)(SERVER_REC *server, const char *data); /* returns all nick flag characters in order op, voice, halfop. If some of them aren't supported '\0' can be used. */ const char *(*get_nick_flags)(void); diff --git a/src/core/servers.h b/src/core/servers.h index c59c7b8c..667a034e 100644 --- a/src/core/servers.h +++ b/src/core/servers.h @@ -17,6 +17,9 @@ #define IS_SERVER_CONNECT(conn) \ (SERVER_CONNECT(conn) ? TRUE : FALSE) +#define server_ischannel(server, channel) \ + (server)->ischannel(server, channel) + /* all strings should be either NULL or dynamically allocated */ /* address and nick are mandatory, rest are optional */ struct _SERVER_CONNECT_REC { |