jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #178 from guiniol/master

Browse Source 
Correctly parse unix sockets servers in the config
This commit is contained in:
Geert Hauwaerts 2014-12-03 16:58:35 +01:00
commit c01e026c73
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/servers-reconnect.c
View File

@ -253,6 +253,9 @@ static void sig_reconnect(SERVER_REC *server)
conn->port = server->connrec->port; conn->port = server->connrec->port;
conn->password = g_strdup(server->connrec->password); conn->password = g_strdup(server->connrec->password);
if (strchr(conn->address, '/') != NULL)
conn->unix_socket = TRUE;
server_reconnect_add(conn, (server->connect_time == 0 ? time(NULL) : server_reconnect_add(conn, (server->connect_time == 0 ? time(NULL) :
server->connect_time) + reconnect_time); server->connect_time) + reconnect_time);
server_connect_unref(conn); server_connect_unref(conn);

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

@ -122,6 +122,9 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn,
conn->address = g_strdup(address); conn->address = g_strdup(address);
if (port > 0) conn->port = port; if (port > 0) conn->port = port;
if (strchr(address, '/') != NULL)
conn->unix_socket = TRUE;
if (!conn->nick) conn->nick = g_strdup(settings_get_str("nick")); if (!conn->nick) conn->nick = g_strdup(settings_get_str("nick"));
conn->username = g_strdup(settings_get_str("user_name")); conn->username = g_strdup(settings_get_str("user_name"));
conn->realname = g_strdup(settings_get_str("real_name")); conn->realname = g_strdup(settings_get_str("real_name"));