diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-03-26 19:56:37 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2007-03-26 19:56:37 +0000 |
| commit | 9de512d65ea053f1d2380b0e3120baf59a472df5 (patch) | |
| tree | 898c634235b0cb6bcbf7d0a9d49e330c412cb6a3 /gui | |
| parent | 5fbf22e81d1380679ca8e5d38d36015ea7991496 (diff) | |
| download | gdm-9de512d65ea053f1d2380b0e3120baf59a472df5.tar.gz | |
Remove the AlwaysRestartServer configuration option. Fixes part of #326771
2007-03-26 William Jon McCann <mccann@jhu.edu>
* configure.ac:
* daemon/gdm-daemon-config-entries.h:
* daemon/gdm-daemon-config-keys.h:
* daemon/gdm-daemon-config.c: (gdm_daemon_config_to_string):
* daemon/slave.c: (gdm_slave_start):
* gui/gdmsetup.c: (setup_general_tab):
* gui/gdmsetup.glade:
Remove the AlwaysRestartServer configuration option.
Fixes part of #326771
svn path=/trunk/; revision=4716
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/gdmsetup.c | 6 | ||||
| -rw-r--r-- | gui/gdmsetup.glade | 20 |
2 files changed, 0 insertions, 26 deletions
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c index d794566b..e75e5792 100644 --- a/gui/gdmsetup.c +++ b/gui/gdmsetup.c @@ -7451,12 +7451,6 @@ setup_general_tab (void) /* Setup use circles in the password entry */ setup_notify_toggle ("use_circles_passwd_checkbox", GDM_KEY_ENTRY_CIRCLES); - /* Setup always restart server */ - setup_notify_toggle ("a_restart_server_checkbutton", GDM_KEY_ALWAYS_RESTART_SERVER); - - /* Setup always login current session */ - setup_notify_toggle ("a_login_curr_session_checkbutton", GDM_KEY_ALWAYS_LOGIN_CURRENT_SESSION); - /* Setup default session */ setup_default_session (); diff --git a/gui/gdmsetup.glade b/gui/gdmsetup.glade index 7259da8e..4b324bd5 100644 --- a/gui/gdmsetup.glade +++ b/gui/gdmsetup.glade @@ -202,26 +202,6 @@ </child> <child> - <widget class="GtkCheckButton" id="a_restart_server_checkbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Does not reuse existing X servers, but kills them and starts over. Normally, just reinitializing is a nicer way to go but if the X server memory usage keeps growing this may be a safer option.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Restart the Xserver with each login</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> <widget class="GtkCheckButton" id="a_login_curr_session_checkbutton"> <property name="visible">True</property> <property name="tooltip" translatable="yes">When the user logs in and already has an existing session, they are connected to that session rather than starting a new session. This only works for session's running on Virtual Terminals started with gdmflexiserver, and not with XDMCP.</property> |