Mercurial > hg > nnchat

comparison main.c @ 690:6fa9c36d0634

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust to match th-libs API changes.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 25 Dec 2019 11:05:31 +0200
parents 1b15cf9442ff
children b5d5d37bbc64
comparison
equal deleted inserted replaced
689:1b15cf9442ff 690:6fa9c36d0634
70 int optPort = 8005, 70 int optPort = 8005,
71 optProxyPort = SET_PROXY_PORT, 71 optProxyPort = SET_PROXY_PORT,
72 optProxyType = TH_PROXY_NONE, 72 optProxyType = TH_PROXY_NONE,
73 optProxyAuthType = TH_PROXY_AUTH_NONE, 73 optProxyAuthType = TH_PROXY_AUTH_NONE,
74 optProxyAddrType = TH_PROXY_ADDR_DOMAIN; 74 optProxyAddrType = TH_PROXY_ADDR_DOMAIN;
75 int optUserColor = 0x000000; 75 unsigned int optUserColor = 0x000000;
76 int optBrowserRunMethod = BMT_NEW_FIREFOX; 76 int optBrowserRunMethod = BMT_NEW_FIREFOX;
77 char *optServer = "chat.newbienudes.com", 77 char *optServer = "chat.newbienudes.com",
78 *optProxyServer = NULL, 78 *optProxyServer = NULL,
79 *optProxyUserID = NULL, 79 *optProxyUserID = NULL,
80 *optProxyPassword = NULL, 80 *optProxyPassword = NULL,
310 case 3: 310 case 3:
311 optServer = optArg; 311 optServer = optArg;
312 break; 312 break;
313 313
314 case 4: 314 case 4:
315 if ((optUserColor = th_get_hex_triplet(optArg)) < 0) 315 if (!th_get_hex_triplet(optArg, &optUserColor))
316 { 316 {
317 THERR("Invalid color argument '%s', should be a RGB hex triplet '000000'.\n", 317 THERR("Invalid color argument '%s', should be a RGB hex triplet '000000'.\n",
318 optArg); 318 optArg);
319 return FALSE; 319 return FALSE;
320 } 320 }
1075 } 1075 }
1076 1076
1077 1077
1078 int nncmd_set_color(th_conn_t *conn, char *arg) 1078 int nncmd_set_color(th_conn_t *conn, char *arg)
1079 { 1079 {
1080 int val; 1080 unsigned int val;
1081 (void) conn; 1081 (void) conn;
1082 1082
1083 if ((val = th_get_hex_triplet(arg)) < 0) 1083 if (!th_get_hex_triplet(arg, &val))
1084 { 1084 {
1085 printMsgQ(currWin, "Invalid color value '%s'\n", arg); 1085 printMsgQ(currWin, "Invalid color value '%s'\n", arg);
1086 return 1; 1086 return 1;
1087 } 1087 }
1088 1088