Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/main.c @ 1610:6db9f403f707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace 'username' with 'jid' in the configuration file The previous behaviour doesn't make much sense anymore. MCabber does DNS SRV lookups so providing the server name is usually not needed.
author Mikael Berthe <mikael@lilotux.net>
date Sun, 11 Oct 2009 20:06:47 +0200
parents 14690e624e9d
children 9296987856d9
comparison
equal deleted inserted replaced
1609:af5bdd167b04 1610:6db9f403f707
338 if (optstring) 338 if (optstring)
339 ut_InitDebug(settings_opt_get_int("tracelog_level"), optstring); 339 ut_InitDebug(settings_opt_get_int("tracelog_level"), optstring);
340 340
341 /* If no password is stored, we ask for it before entering 341 /* If no password is stored, we ask for it before entering
342 ncurses mode -- unless the username is unknown. */ 342 ncurses mode -- unless the username is unknown. */
343 if (settings_opt_get("username") && !settings_opt_get("password")) { 343 if (settings_opt_get("jid") && !settings_opt_get("password")) {
344 const char *p; 344 const char *p;
345 char *pwd; 345 char *pwd;
346 p = settings_opt_get("server"); 346 p = settings_opt_get("server");
347 if (p) 347 if (p)
348 printf("Server: %s\n", p); 348 printf("Server: %s\n", p);
349 p = settings_opt_get("username"); 349 p = settings_opt_get("jid");
350 if (p) 350 if (p)
351 printf("Username: %s\n", p); 351 printf("User JID: %s\n", p);
352 352
353 pwd = ask_password("Jabber password"); 353 pwd = ask_password("Jabber password");
354 settings_set(SETTINGS_TYPE_OPTION, "password", pwd); 354 settings_set(SETTINGS_TYPE_OPTION, "password", pwd);
355 g_free(pwd); 355 g_free(pwd);
356 } 356 }