aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00
Code

server->ischannel(char *) -> server->ischannel(SERVER_REC *, char *). Added

Browse Source 
#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
This commit is contained in:
Timo Sirainen 2001-11-01 22:52:23 +00:00 committed by cras
parent 9833844f38
commit 95b94ed83c
10 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/chat-commands.c
View File

@ -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);

2
src/core/commands.c
View File

@ -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.

2
src/core/ignore.c
View File

@ -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) {

2
src/core/server-rec.h
View File

@ -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);

3
src/core/servers.h
View File

@ -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 {

2
src/fe-common/core/chat-completion.c
View File

@ -569,7 +569,7 @@ static void sig_complete_word(GList **list, WINDOW_REC *window,
if (server == NULL && servers != NULL)
server = servers->data;
if (server != NULL && server->ischannel(word)) {
if (server != NULL && server_ischannel(server, word)) {
/* probably completing a channel name */
*list = completion_get_channels(window->active_server, word);
return;

4
src/fe-common/core/fe-ignore.c
View File

@ -112,7 +112,7 @@ static void cmd_ignore(const char *data)
if (*levels == '\0') levels = "ALL";
if (active_win->active_server != NULL &&
active_win->active_server->ischannel(mask)) {
server_ischannel(active_win->active_server, mask)) {
chanarg = mask;
mask = NULL;
}
@ -187,7 +187,7 @@ static void cmd_unignore(const char *data)
const char *chans[2] = { "*", NULL };
if (active_win->active_server != NULL &&
active_win->active_server->ischannel(mask)) {
server_ischannel(active_win->active_server, mask)) {
chans[0] = mask;
mask = NULL;
}

2
src/fe-common/core/fe-log.c
View File

@ -573,7 +573,7 @@ static int sig_autoremove(void)
server = server_find_tag(logitem->servertag);
if (logitem->type == LOG_ITEM_TARGET &&
server != NULL && !server->ischannel(logitem->name))
server != NULL && !server_ischannel(server, logitem->name))
log_close(log);
}
return 1;

2
src/irc/core/irc-servers.c
View File

@ -60,7 +60,7 @@ static int isnickflag_func(char flag)
return isnickflag(flag);
}
static int ischannel_func(const char *data)
static int ischannel_func(SERVER_REC *server, const char *data)
{
if (*data == '@') {
/* @#channel, @+#channel */

2
src/perl/common/Server.xs
View File

@ -101,7 +101,7 @@ ischannel(server, data)
Irssi::Server server
char *data
CODE:
RETVAL = server->ischannel(data);
RETVAL = server->ischannel(server, data);
OUTPUT:
RETVAL