Commit 925d5eda authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

Remove some unused code. Fix so when you click on the include_all button,

2006-05-30  Brian Cameron  <brian.cameron@sun.com>

        * daemon/gdm.c: Remove some unused code.
        * gui/gdmsetup.c: Fix so when you click on the include_all
          button, the Automatic/Timed login values update properly.
parent e5456529
2006-05-30 Brian Cameron <brian.cameron@sun.com>
* daemon/gdm.c: Remove some unused code.
* gui/gdmsetup.c: Fix so when you click on the include_all
button, the Automatic/Timed login values update properly.
2006-05-24 Brian Cameron <brian.cameron@sun.com>
* daemon/gdm.c, docs/C/gdm.xml: Put back support for -nodaemon
......
......@@ -3162,25 +3162,16 @@ gdm_handle_user_message (GdmConnection *conn, const gchar *msg, gpointer data)
g_strfreev (splitstr);
}
} else if (strcmp (msg, GDM_SUP_GET_CONFIG_FILE) == 0) {
GString *msg;
msg = g_string_new ("OK");
g_string_append (msg, "\n");
gdm_connection_printf (conn, "OK %s\n", config_file);
g_string_free (msg, TRUE);
} else if (strcmp (msg, GDM_SUP_GET_CUSTOM_CONFIG_FILE) == 0) {
GString *msg;
gchar *ret;
msg = g_string_new ("OK");
g_string_append (msg, "\n");
ret = gdm_get_custom_config_file ();
if (ret)
gdm_connection_printf (conn, "OK %s\n", ret);
else
gdm_connection_write (conn,
"ERROR 1 File not found\n");
g_string_free (msg, TRUE);
} else if (strcmp (msg, GDM_SUP_QUERY_LOGOUT_ACTION) == 0) {
GdmLogoutAction logout_action;
GdmDisplay *disp;
......
......@@ -111,7 +111,7 @@
<para>Nota: las distribuciones a menudo cambian los valores predeterminados de las claves para soportar su plataforma. Los interfaces de línea de comandos para los programas GDM instalados en <filename>&lt;bin&gt;</filename> y <filename>&lt;sbin&gt;</filename> se consideran estables. Refiérase a su documentación de la distribución para ver si hay cualquier cambio específico de la distribución a estos interfaces de GDM y qué soporte existe para ellos.</para>
<para>As of the GDM 2.15 development series one-dash arguments are no longer supported. This includes the "-nodaemon" argument used by <command>gdm</command> and <command>gdm-binary</command>. It also includes the "-xdmaddress", "-clientaddress", and "-connectionType" arguments used by <command>gdmchooser</command>. These arguments have been changed to now use two dashes. GDM previously supported the one-dash arguments to be more similar with the XDM login manager, but one-dash command line arguments is deprecated in the GNOME stack.</para>
<para>As of the GDM 2.15 development series, some one-dash arguments are no longer supported. This includes the "-xdmaddress", "-clientaddress", and "-connectionType" arguments used by <command>gdmchooser</command>. These arguments have been changed to now use two dashes.</para>
<para>Si se descubrieran problemas que rompiesen la compatibilidad, por favor envíe un error con una prioridad «urgente».</para>
</sect2>
......@@ -2775,7 +2775,7 @@ remote-flexi - In remote (XDMCP) &amp; flexi mode.
<varlistentry>
<term>--nodaemon</term>
<listitem>
<para>If this option is specified, then GDM does not fork into the background when run. Note that you cannot use the single-dash option any more that e.g. XDM understands.</para>
<para>If this option is specified, then GDM does not fork into the background when run. You can also use a single-dash version, "-nodaemon" for compatibility with other display managers.</para>
</listitem>
</varlistentry>
......
......@@ -111,7 +111,7 @@
<para>Note: distributions often change the default values of keys to support their platform. Command-line interfaces for GDM programs installed to <filename>&lt;bin&gt;</filename> and <filename>&lt;sbin&gt;</filename> are considered stable. Refer to your distribution documentation to see if there are any distribution-specific changes to these GDM interfaces and what support exists for them.</para>
<para>As of the GDM 2.15 development series one-dash arguments are no longer supported. This includes the "-nodaemon" argument used by <command>gdm</command> and <command>gdm-binary</command>. It also includes the "-xdmaddress", "-clientaddress", and "-connectionType" arguments used by <command>gdmchooser</command>. These arguments have been changed to now use two dashes. GDM previously supported the one-dash arguments to be more similar with the XDM login manager, but one-dash command line arguments is deprecated in the GNOME stack.</para>
<para>As of the GDM 2.15 development series, some one-dash arguments are no longer supported. This includes the "-xdmaddress", "-clientaddress", and "-connectionType" arguments used by <command>gdmchooser</command>. These arguments have been changed to now use two dashes.</para>
<para>If issues are discovered that break compatibility, please file a bug with an "urgent" priority.</para>
</sect2>
......@@ -2773,7 +2773,7 @@ remote-flexi - In remote (XDMCP) &amp; flexi mode.
<varlistentry>
<term>--nodaemon</term>
<listitem>
<para>If this option is specified, then GDM does not fork into the background when run. Note that you cannot use the single-dash option any more that e.g. XDM understands.</para>
<para>If this option is specified, then GDM does not fork into the background when run. You can also use a single-dash version, "-nodaemon" for compatibility with other display managers.</para>
</listitem>
</varlistentry>
......
......@@ -2190,6 +2190,20 @@ setup_face (void)
G_CALLBACK (browser_apply), &fc);
}
static void
include_all_toggle (GtkWidget *toggle)
{
if (GTK_TOGGLE_BUTTON (toggle)->active)
GdmIncludeAll = TRUE;
else
GdmIncludeAll = FALSE;
setup_user_combobox_list ("autologin_combo",
GDM_KEY_AUTOMATIC_LOGIN);
setup_user_combobox_list ("timedlogin_combo",
GDM_KEY_TIMED_LOGIN);
}
static gboolean
greeter_toggle_timeout (GtkWidget *toggle)
{
......@@ -2222,6 +2236,10 @@ greeter_toggle_timeout (GtkWidget *toggle)
}
gdm_setup_config_set_bool (key, GTK_TOGGLE_BUTTON (toggle)->active);
update_greeters ();
if (strcmp (ve_sure_string (key), GDM_KEY_INCLUDE_ALL) == 0) {
include_all_toggle (toggle);
}
}
return FALSE;
......@@ -2313,20 +2331,6 @@ local_background_type_toggled (GtkWidget *toggle)
run_timeout (toggle, 200, local_background_type_toggle_timeout);
}
static void
include_all_toggle (GtkWidget *toggle)
{
if (GTK_TOGGLE_BUTTON (toggle)->active)
GdmIncludeAll = TRUE;
else
GdmIncludeAll = FALSE;
setup_user_combobox_list ("autologin_combo",
GDM_KEY_AUTOMATIC_LOGIN);
setup_user_combobox_list ("timedlogin_combo",
GDM_KEY_TIMED_LOGIN);
}
static void
setup_greeter_toggle (const char *name,
const char *key)
......@@ -2391,8 +2395,6 @@ setup_greeter_toggle (const char *name,
G_CALLBACK (list_selection_toggled), fb_includeremove);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (sensitive_entry_toggled), fb_includelabel);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (include_all_toggle), NULL);
}
else if (strcmp ("acc_sound_ready", ve_sure_string (name)) == 0) {
......@@ -6533,7 +6535,7 @@ main (int argc, char *argv[])
GdmIconMaxHeight = gdm_config_get_int (GDM_KEY_MAX_ICON_HEIGHT);
GdmIconMaxWidth = gdm_config_get_int (GDM_KEY_MAX_ICON_WIDTH);
GdmMinimalUID = gdm_config_get_int (GDM_KEY_MINIMAL_UID);
GdmIncludeAll = gdm_config_get_bool ( GDM_KEY_INCLUDE_ALL);
GdmIncludeAll = gdm_config_get_bool (GDM_KEY_INCLUDE_ALL);
GdmInclude = gdm_config_get_string (GDM_KEY_INCLUDE);
GdmExclude = gdm_config_get_string (GDM_KEY_EXCLUDE);
GdmSoundProgram = gdm_config_get_string (GDM_KEY_SOUND_PROGRAM);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment