git-svn-id: http://svn.irssi.org/repos/irssi/trunk@634 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-08-27 23:07:01 +00:00 committed by cras
commit 3e2f19b030
9 changed files with 30 additions and 29 deletions

View file

@ -173,7 +173,7 @@ create_addr_conn(const char *address, int port,
g_return_val_if_fail(address != NULL, NULL);
sserver = server_setup_find(address, port);
chatnet = sserver->chatnet == NULL ? NULL :
chatnet = sserver == NULL || sserver->chatnet == NULL ? NULL :
chatnet_find(sserver->chatnet);
conn = NULL;
signal_emit("server setup connect", 2, &conn, chatnet);

View file

@ -206,6 +206,23 @@ int server_start_connect(SERVER_REC *server)
MODULE_DATA_INIT(server);
server->type = module_get_uniq_id("SERVER", 0);
server->nick = g_strdup(server->connrec->nick);
if (server->connrec->port <= 0) server->connrec->port = 6667;
if (server->connrec->username == NULL || *server->connrec->username == '\0') {
g_free_not_null(server->connrec->username);
server->connrec->username = g_get_user_name();
if (*server->connrec->username == '\0') server->connrec->username = "-";
server->connrec->username = g_strdup(server->connrec->username);
}
if (server->connrec->realname == NULL || *server->connrec->realname == '\0') {
g_free_not_null(server->connrec->realname);
server->connrec->realname = g_get_real_name();
if (*server->connrec->realname == '\0') server->connrec->realname = "-";
server->connrec->realname = g_strdup(server->connrec->realname);
}
if (pipe(server->connect_pipe) != 0) {
g_warning("server_connect(): pipe() failed.");
return FALSE;