Mercurial > hg > nnchat

comparison main.c @ 546:3d7ff16389cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics and comments.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 12 Nov 2012 11:28:37 +0200
parents 895ede06ff11
children 28688eb812de
comparison
equal deleted inserted replaced
545:895ede06ff11 546:3d7ff16389cf
1665 } 1665 }
1666 #else 1666 #else
1667 { 1667 {
1668 char *xdgConfigDir = getenv("XDG_CONFIG_HOME"), 1668 char *xdgConfigDir = getenv("XDG_CONFIG_HOME"),
1669 *userHomeDir = getenv("HOME"); 1669 *userHomeDir = getenv("HOME");
1670
1670 #ifdef USE_XDG 1671 #ifdef USE_XDG
1672 // If XDG is enabled, try the environment variable first
1671 if (xdgConfigDir != NULL) 1673 if (xdgConfigDir != NULL)
1672 setHomeDir = th_strdup(xdgConfigDir); 1674 setHomeDir = th_strdup(xdgConfigDir);
1673 else 1675 else
1676 // Nope, try the obvious alternative
1674 setHomeDir = th_strdup_printf("%s/.config", userHomeDir); 1677 setHomeDir = th_strdup_printf("%s/.config", userHomeDir);
1675 #else 1678 #else
1676 setHomeDir = th_strdup(userHomeDir); 1679 setHomeDir = th_strdup(userHomeDir);
1677 #endif 1680 #endif
1678 } 1681 }
1690 th_cfg_read(cfgfile, setConfigFile, cfg); 1693 th_cfg_read(cfgfile, setConfigFile, cfg);
1691 fclose(cfgfile); 1694 fclose(cfgfile);
1692 } 1695 }
1693 } 1696 }
1694 1697
1695 optNickSep = optNickSepStr ? optNickSepStr[0] : SET_NICK_SEPARATOR; 1698 optNickSep = optNickSepStr ? optNickSepStr[0] : SET_NICK_SEPARATOR;
1696 1699
1697 setBrowser = getenv("BROWSER"); 1700 setBrowser = getenv("BROWSER");
1698 if (setBrowser == NULL) 1701 if (setBrowser == NULL)
1699 setBrowser = "firefox"; 1702 setBrowser = "firefox";
1700 1703