mirror of
https://github.com/irssi/irssi.git
synced 2026-08-14 22:22:15 +02:00
Merge pull request #1246 from ailin-nemui/wrong-prefixes
correct wrong function prefixes
Module authors will have to adapt these changes:
[M] 'constant I_INPUT_READ' {G_INPUT_READ}
[M] 'constant I_INPUT_WRITE' {G_INPUT_WRITE}
[M] 'function int i_input_add(GIOChannel*, int, GInputFunction, void*)' {g_input_add}
[M] 'function int i_input_add_full(GIOChannel*, int, int, GInputFunction, void*)' {g_input_add_full}
[M] 'function int i_input_add_poll(int, int, int, GInputFunction, void*)' {g_input_add_poll}
[M] 'function GIOChannel* i_io_channel_new(int)' {g_io_channel_new}
[M] 'function int i_io_channel_read_block(GIOChannel*, void*, int)' {g_io_channel_read_block}
[M] 'function int i_io_channel_write_block(GIOChannel*, void*, int)' {g_io_channel_write_block}
[M] 'function int i_istr_cmp(gconstpointer, gconstpointer)' {g_istr_cmp}
[M] 'function int i_istr_equal(gconstpointer, gconstpointer)' {g_istr_equal}
[M] 'function guint i_istr_hash(gconstpointer)' {g_istr_hash}
[M] 'function void i_log_func(const char*, GLogLevelFlags, const char*)' {glog_func}
[M] 'function GSList* i_slist_delete_string(GSList*, const char*, GDestroyNotify)' {gslist_delete_string}
[M] 'function GSList* i_slist_find_icase_string(GSList*, const char*)' {gslist_find_icase_string}
[M] 'function GSList* i_slist_find_string(GSList*, const char*)' {gslist_find_string}
[M] 'function void* i_slist_foreach_find(GSList*, FOREACH_FIND_FUNC, void*)' {gslist_foreach_find}
[M] 'function void i_slist_free_full(GSList*, GDestroyNotify)' {gslist_free_full}
[M] 'function GSList* i_slist_remove_string(GSList*, const char*)' {gslist_remove_string}
[M] 'function char* i_slist_to_string(GSList*, const char*)' {gslist_to_string}
This commit is contained in:
commit
db9aa817d5
46 changed files with 181 additions and 231 deletions
|
|
@ -74,7 +74,7 @@ static GIOChannel *net_listen_unix(const char *path)
|
|||
goto error_unlink;
|
||||
}
|
||||
|
||||
return g_io_channel_new(handle);
|
||||
return i_io_channel_new(handle);
|
||||
|
||||
error_unlink:
|
||||
unlink(sa.sun_path);
|
||||
|
|
@ -99,7 +99,7 @@ static GIOChannel *net_accept_unix(GIOChannel *handle)
|
|||
return NULL;
|
||||
|
||||
fcntl(ret, F_SETFL, O_NONBLOCK);
|
||||
return g_io_channel_new(ret);
|
||||
return i_io_channel_new(ret);
|
||||
}
|
||||
|
||||
static void remove_client(CLIENT_REC *rec)
|
||||
|
|
@ -470,8 +470,7 @@ static void sig_listen(LISTEN_REC *listen)
|
|||
rec->server = servers == NULL ? NULL :
|
||||
IRC_SERVER(server_find_chatnet(listen->ircnet));
|
||||
}
|
||||
rec->recv_tag = g_input_add(handle, G_INPUT_READ,
|
||||
(GInputFunction) sig_listen_client, rec);
|
||||
rec->recv_tag = i_input_add(handle, I_INPUT_READ, (GInputFunction) sig_listen_client, rec);
|
||||
|
||||
proxy_clients = g_slist_prepend(proxy_clients, rec);
|
||||
listen->clients = g_slist_prepend(listen->clients, rec);
|
||||
|
|
@ -739,8 +738,7 @@ static void add_listen(const char *ircnet, int port, const char *port_or_path)
|
|||
rec->port = port;
|
||||
rec->port_or_path = g_strdup(port_or_path);
|
||||
|
||||
rec->tag = g_input_add(rec->handle, G_INPUT_READ,
|
||||
(GInputFunction) sig_listen, rec);
|
||||
rec->tag = i_input_add(rec->handle, I_INPUT_READ, (GInputFunction) sig_listen, rec);
|
||||
|
||||
proxy_listens = g_slist_append(proxy_listens, rec);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue