1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00

Fix bogus secure-keyboard startup mode for gnome-terminal.

PR:		16219
Submitted by:	Andrew J. Korty <ajk@waterspout.com>
This commit is contained in:
Ade Lovett 2000-01-21 03:55:13 +00:00
parent dbe4b24a7f
commit 850941fe1e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=24863

View File

@ -1,6 +1,14 @@
--- gnome-terminal/gnome-terminal.c.orig Thu Nov 11 18:05:12 1999
+++ gnome-terminal/gnome-terminal.c Thu Jan 13 16:01:31 2000
@@ -507,7 +507,8 @@
+++ gnome-terminal/gnome-terminal.c Thu Jan 20 17:00:49 2000
@@ -480,6 +480,7 @@
cfg->color_type = PALETTE_CUSTOM;
else
cfg->color_type = PALETTE_LINUX;
+ cfg->keyboard_secured = gnome_config_get_bool ("keyboard_secured=0");
cfg->bell = gnome_config_get_bool ("bell_silenced=0");
cfg->blink = gnome_config_get_bool ("blinking=0");
cfg->swap_keys = gnome_config_get_bool ("swap_del_and_backspace=0");
@@ -507,7 +508,8 @@
cfg->termname = NULL;
cfg->terminal_id = 0;
@ -10,7 +18,15 @@
if (strcasecmp (fore_color, back_color) == 0)
/* don't let them set identical foreground and background colors */
@@ -2260,6 +2261,8 @@
@@ -994,6 +996,7 @@
gnome_config_set_string ("scrollpos",
cfg->scrollbar_position == SCROLLBAR_LEFT ? "left" :
cfg->scrollbar_position == SCROLLBAR_RIGHT ? "right" : "hidden");
+ gnome_config_set_bool ("keyboard_secured", cfg->keyboard_secured);
gnome_config_set_bool ("bell_silenced", cfg->bell);
gnome_config_set_bool ("blinking", cfg->blink);
gnome_config_set_bool ("swap_del_and_backspace", cfg->swap_keys);
@@ -2260,6 +2263,8 @@
cfg->update_records |= ZVT_TERM_DO_UTMP_LOG;
if (gnome_config_get_bool ("do_wtmp=true"))
cfg->update_records |= ZVT_TERM_DO_WTMP_LOG;
@ -19,7 +35,7 @@
termid = gnome_config_get_int("terminal_id=-1");
if (termid!=-1)
@@ -2367,6 +2370,7 @@
@@ -2367,6 +2372,7 @@
gnome_config_set_string("window_title", cfg->window_title?cfg->window_title:"Terminal");
gnome_config_set_bool("do_utmp", (cfg->update_records & ZVT_TERM_DO_UTMP_LOG) != 0);
gnome_config_set_bool("do_wtmp", (cfg->update_records & ZVT_TERM_DO_WTMP_LOG) != 0);
@ -27,7 +43,7 @@
gnome_config_pop_prefix ();
g_free (prefix);
@@ -2417,8 +2421,10 @@
@@ -2417,8 +2423,10 @@
DONOUTMP_KEY = -10,
DOWTMP_KEY = -11,
DONOWTMP_KEY = -12,
@ -40,7 +56,7 @@
};
static struct poptOption cb_options [] = {
@@ -2462,6 +2468,12 @@
@@ -2462,6 +2470,12 @@
{ "nowtmp", '\0', POPT_ARG_NONE, NULL, DONOWTMP_KEY,
N_("Do not update wtmp entry"), N_("NOWTMP") },
@ -53,7 +69,7 @@
{ "title", 't', POPT_ARG_STRING, NULL, TITLE_KEY,
N_("Set the window title"), N_("TITLE") },
@@ -2538,6 +2550,14 @@
@@ -2538,6 +2552,14 @@
case DONOWTMP_KEY:
cfg->update_records_and &= ~ZVT_TERM_DO_WTMP_LOG;
cfg->update_records_xor &= ~ZVT_TERM_DO_WTMP_LOG;