mirror of
https://github.com/irssi/irssi.git
synced 2026-08-10 20:33:46 +02:00
Fixed one error and several warnings with GLIB 2.0
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2663 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
ec168a4009
commit
bd00ff54c2
7 changed files with 23 additions and 16 deletions
|
|
@ -257,6 +257,8 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
|
|||
/* initializes server record but doesn't start connecting */
|
||||
void server_connect_init(SERVER_REC *server)
|
||||
{
|
||||
const char *str;
|
||||
|
||||
g_return_if_fail(server != NULL);
|
||||
|
||||
MODULE_DATA_INIT(server);
|
||||
|
|
@ -267,16 +269,16 @@ void server_connect_init(SERVER_REC *server)
|
|||
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);
|
||||
str = g_get_user_name();
|
||||
if (*str == '\0') str = "-";
|
||||
server->connrec->username = g_strdup(str);
|
||||
}
|
||||
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);
|
||||
str = g_get_real_name();
|
||||
if (*str == '\0') str = "-";
|
||||
server->connrec->realname = g_strdup(str);
|
||||
}
|
||||
|
||||
server->tag = server_create_tag(server->connrec);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue