aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Fix #45 Make it easy to delete default channels, servers and networks

Browse Source 
Removing network will now also remove all attached servers
This commit is contained in:
isundil 2015-10-01 21:14:30 +02:00
parent 8217147a80
commit 2ad6bb1295
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/servers-setup.c
View File

@ -333,6 +333,24 @@ server_create_conn(int chat_type, const char *dest, int port,
chatnet, password, nick); chatnet, password, nick);
} }
GSList *server_setup_find_chatnet(const char *chatnet)
{
GSList *servers;
GSList *tmp;
g_return_val_if_fail(chatnet != NULL, NULL);
servers = NULL;
for (tmp = setupservers; tmp != NULL; tmp = tmp->next) {
SERVER_SETUP_REC *rec = tmp->data;
if (g_ascii_strcasecmp(rec->chatnet, chatnet) == 0)
servers = g_slist_append(servers, rec);
}
return servers;
}
/* Find matching server from setup. Try to find record with a same port, /* Find matching server from setup. Try to find record with a same port,
but fallback to any server with the same address. */ but fallback to any server with the same address. */
SERVER_SETUP_REC *server_setup_find(const char *address, int port, SERVER_SETUP_REC *server_setup_find(const char *address, int port,

4
src/core/servers-setup.h
View File

@ -36,6 +36,10 @@ server_create_conn(int chat_type, const char *dest, int port,
SERVER_SETUP_REC *server_setup_find(const char *address, int port, SERVER_SETUP_REC *server_setup_find(const char *address, int port,
const char *chatnet); const char *chatnet);
/* Find all servers matching chatnet.
Return a list of SERVER_SETUP_REC */
GSList *server_setup_find_chatnet(const char *chatnet);
void server_setup_add(SERVER_SETUP_REC *rec); void server_setup_add(SERVER_SETUP_REC *rec);
void server_setup_remove(SERVER_SETUP_REC *rec); void server_setup_remove(SERVER_SETUP_REC *rec);

6
src/fe-common/irc/fe-ircnet.c
View File

@ -176,6 +176,8 @@ static void cmd_network_add(const char *data)
static void cmd_network_remove(const char *data) static void cmd_network_remove(const char *data)
{ {
IRC_CHATNET_REC *rec; IRC_CHATNET_REC *rec;
GSList *servers;
GSList *tmp;
if (*data == '\0') cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS); if (*data == '\0') cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
@ -183,6 +185,10 @@ static void cmd_network_remove(const char *data)
if (rec == NULL) if (rec == NULL)
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_NOT_FOUND, data); printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_NOT_FOUND, data);
else { else {
servers = server_setup_find_chatnet(data);
for (tmp = servers; tmp != NULL; tmp = tmp->next)
server_setup_remove((SERVER_SETUP_REC *) tmp->data);
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_REMOVED, data); printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_REMOVED, data);
chatnet_remove(CHATNET(rec)); chatnet_remove(CHATNET(rec));
} }