View | Details | Raw Unified | Return to bug 16081
Collapse All | Expand All

(-)gnome-terminal/gnome-terminal.c (-3 / +23 lines)
Lines 507-513 Link Here
507
	cfg->termname = NULL;
507
	cfg->termname = NULL;
508
	cfg->terminal_id = 0;
508
	cfg->terminal_id = 0;
509
509
510
	cfg->update_records = ZVT_TERM_DO_UTMP_LOG|ZVT_TERM_DO_WTMP_LOG;
510
	cfg->update_records = ZVT_TERM_DO_UTMP_LOG | ZVT_TERM_DO_WTMP_LOG
511
	   | ZVT_TERM_DO_LASTLOG;
511
512
512
	if (strcasecmp (fore_color, back_color) == 0)
513
	if (strcasecmp (fore_color, back_color) == 0)
513
		/* don't let them set identical foreground and background colors */
514
		/* don't let them set identical foreground and background colors */
Lines 2260-2265 Link Here
2260
			cfg->update_records |= ZVT_TERM_DO_UTMP_LOG;
2261
			cfg->update_records |= ZVT_TERM_DO_UTMP_LOG;
2261
		if (gnome_config_get_bool ("do_wtmp=true"))
2262
		if (gnome_config_get_bool ("do_wtmp=true"))
2262
			cfg->update_records |= ZVT_TERM_DO_WTMP_LOG;
2263
			cfg->update_records |= ZVT_TERM_DO_WTMP_LOG;
2264
		if (gnome_config_get_bool ("do_lastlog=true"))
2265
			cfg->update_records |= ZVT_TERM_DO_LASTLOG;
2263
2266
2264
		termid = gnome_config_get_int("terminal_id=-1");
2267
		termid = gnome_config_get_int("terminal_id=-1");
2265
		if (termid!=-1)
2268
		if (termid!=-1)
Lines 2367-2372 Link Here
2367
		gnome_config_set_string("window_title", cfg->window_title?cfg->window_title:"Terminal");
2370
		gnome_config_set_string("window_title", cfg->window_title?cfg->window_title:"Terminal");
2368
		gnome_config_set_bool("do_utmp", (cfg->update_records & ZVT_TERM_DO_UTMP_LOG) != 0);
2371
		gnome_config_set_bool("do_utmp", (cfg->update_records & ZVT_TERM_DO_UTMP_LOG) != 0);
2369
		gnome_config_set_bool("do_wtmp", (cfg->update_records & ZVT_TERM_DO_WTMP_LOG) != 0);
2372
		gnome_config_set_bool("do_wtmp", (cfg->update_records & ZVT_TERM_DO_WTMP_LOG) != 0);
2373
		gnome_config_set_bool("do_lastlog", (cfg->update_records & ZVT_TERM_DO_LASTLOG) != 0);
2370
2374
2371
		gnome_config_pop_prefix ();
2375
		gnome_config_pop_prefix ();
2372
		g_free (prefix);
2376
		g_free (prefix);
Lines 2417-2424 Link Here
2417
	DONOUTMP_KEY = -10,
2421
	DONOUTMP_KEY = -10,
2418
	DOWTMP_KEY   = -11,
2422
	DOWTMP_KEY   = -11,
2419
	DONOWTMP_KEY = -12,
2423
	DONOWTMP_KEY = -12,
2420
        TITLE_KEY    = -13,
2424
	DOLASTLOG_KEY   = -13,
2421
	TERM_KEY     = -14
2425
	DONOLASTLOG_KEY = -14,
2426
        TITLE_KEY    = -15,
2427
	TERM_KEY     = -16
2422
};
2428
};
2423
2429
2424
static struct poptOption cb_options [] = {
2430
static struct poptOption cb_options [] = {
Lines 2462-2467 Link Here
2462
2468
2463
	{ "nowtmp", '\0', POPT_ARG_NONE, NULL, DONOWTMP_KEY,
2469
	{ "nowtmp", '\0', POPT_ARG_NONE, NULL, DONOWTMP_KEY,
2464
	  N_("Do not update wtmp entry"), N_("NOWTMP") },
2470
	  N_("Do not update wtmp entry"), N_("NOWTMP") },
2471
2472
	{ "lastlog", '\0', POPT_ARG_NONE, NULL, DOLASTLOG_KEY,
2473
	  N_("Update lastlog entry"), N_("LASTLOG") },
2474
2475
	{ "nolastlog", '\0', POPT_ARG_NONE, NULL, DONOLASTLOG_KEY,
2476
	  N_("Do not update lastlog entry"), N_("NOLASTLOG") },
2465
	
2477
	
2466
	{ "title", 't', POPT_ARG_STRING, NULL, TITLE_KEY,
2478
	{ "title", 't', POPT_ARG_STRING, NULL, TITLE_KEY,
2467
          N_("Set the window title"), N_("TITLE") },
2479
          N_("Set the window title"), N_("TITLE") },
Lines 2538-2543 Link Here
2538
	case DONOWTMP_KEY:
2550
	case DONOWTMP_KEY:
2539
		cfg->update_records_and &= ~ZVT_TERM_DO_WTMP_LOG;
2551
		cfg->update_records_and &= ~ZVT_TERM_DO_WTMP_LOG;
2540
		cfg->update_records_xor &= ~ZVT_TERM_DO_WTMP_LOG;
2552
		cfg->update_records_xor &= ~ZVT_TERM_DO_WTMP_LOG;
2553
		break;
2554
	case DOLASTLOG_KEY:
2555
		cfg->update_records_and &= ~ZVT_TERM_DO_LASTLOG;
2556
		cfg->update_records_xor |= ZVT_TERM_DO_LASTLOG;
2557
		break;
2558
	case DONOLASTLOG_KEY:
2559
		cfg->update_records_and &= ~ZVT_TERM_DO_LASTLOG;
2560
		cfg->update_records_xor &= ~ZVT_TERM_DO_LASTLOG;
2541
		break;
2561
		break;
2542
	case TITLE_KEY:
2562
	case TITLE_KEY:
2543
	        cfg->window_title = g_strdup(arg);
2563
	        cfg->window_title = g_strdup(arg);

Return to bug 16081