iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #625 from orium/network-name-improve

Browse Source 
Improved server_get_network()
This commit is contained in:
TingPing 2013-05-25 16:31:51 -07:00
commit c9c8993b9d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/server.c
View File

@ -1903,9 +1903,14 @@ server_set_defaults (server *serv)
char * char *
server_get_network (server *serv, gboolean fallback) server_get_network (server *serv, gboolean fallback)
{ {
/* check the network list */
if (serv->network) if (serv->network)
return ((ircnet *)serv->network)->name; return ((ircnet *)serv->network)->name;
/* check the network name given in 005 NETWORK=... */
if (serv->server_session && *serv->server_session->channel)
return serv->server_session->channel;
if (fallback) if (fallback)
return serv->servername; return serv->servername;