mirror of
https://github.com/irssi/irssi.git
synced 2026-08-18 08:02:13 +02:00
s/enum GInputCondition/int/ - enums aren't supposed to orred together i
think.. at least MIPSpro gave warnings about it and it also feels wrong :) git-svn-id: http://svn.irssi.org/repos/irssi/trunk@865 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
8961d23171
commit
d1d70fd5d7
7 changed files with 14 additions and 19 deletions
|
|
@ -28,7 +28,7 @@
|
|||
#endif
|
||||
|
||||
typedef struct {
|
||||
GInputCondition condition;
|
||||
int condition;
|
||||
GInputFunction function;
|
||||
void *data;
|
||||
} IRSSI_INPUT_REC;
|
||||
|
|
@ -37,7 +37,7 @@ static int irssi_io_invoke(GIOChannel *source, GIOCondition condition,
|
|||
void *data)
|
||||
{
|
||||
IRSSI_INPUT_REC *rec = data;
|
||||
GInputCondition icond = (GInputCondition)0;
|
||||
int icond = 0;
|
||||
|
||||
if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) {
|
||||
/* error, we have to call the function.. */
|
||||
|
|
@ -60,7 +60,7 @@ static int irssi_io_invoke(GIOChannel *source, GIOCondition condition,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
int g_input_add_full(int source, int priority, GInputCondition condition,
|
||||
int g_input_add_full(int source, int priority, int condition,
|
||||
GInputFunction function, void *data)
|
||||
{
|
||||
IRSSI_INPUT_REC *rec;
|
||||
|
|
@ -87,7 +87,7 @@ int g_input_add_full(int source, int priority, GInputCondition condition,
|
|||
return result;
|
||||
}
|
||||
|
||||
int g_input_add(int source, GInputCondition condition,
|
||||
int g_input_add(int source, int condition,
|
||||
GInputFunction function, void *data)
|
||||
{
|
||||
return g_input_add_full(source, G_PRIORITY_DEFAULT, condition,
|
||||
|
|
|
|||
|
|
@ -190,8 +190,7 @@ static void simple_readpipe(SIMPLE_THREAD_REC *rec, int pipe)
|
|||
return;
|
||||
}
|
||||
|
||||
rec->tag = g_input_add(handle,
|
||||
(GInputCondition) (G_INPUT_READ|G_INPUT_WRITE),
|
||||
rec->tag = g_input_add(handle, G_INPUT_READ | G_INPUT_WRITE,
|
||||
(GInputFunction) simple_init, rec);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -200,8 +200,7 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
|
|||
|
||||
server->handle = net_sendbuffer_create(handle, 0);
|
||||
server->connect_tag =
|
||||
g_input_add(handle,
|
||||
(GInputCondition) (G_INPUT_WRITE|G_INPUT_READ),
|
||||
g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ,
|
||||
(GInputFunction) server_connect_callback_init,
|
||||
server);
|
||||
signal_emit("server connecting", 2, server, &iprec.ip);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue