Complain on some more errors

Tue Dec 30 15:34:59 2003  George Lebl <jirka@5z.com>

	* daemon/gdm.c, daemon/auth.c:  Complain on some more errors

	* gui/gdmlogin.c, gui/gdmcommon.[ch], gui/gdmsetup.(c|glade),
	  gui/greeter/greeter.c, gui/greeter/greeter_configuration.h,
	  daemon/gdm.[ch], daemon/slave.c: Make the login sound thingie
	  configurable and make it possible to play an arbitrary sound with
	  /usr/bin/play (or whatever else is configured).  Add accessibility
	  section to gdmsetup which configures the accessibility modules
	  and the sound.  Fixes #125487

	* config/gdm.conf.in, docs/C/gdm.xml:  Update docs for the
	  accessibility/sound stuff

8 files changed, 657 insertions, 23 deletions

diff --git a/gui/gdmcommon.c b/gui/gdmcommon.c
index 04da5544..615ae43e 100644
--- a/gui/gdmcommon.c
+++ b/gui/gdmcommon.c
@@ -36,6 +36,9 @@
 
 extern gchar *GdmInfoMsgFile;
 extern gchar *GdmInfoMsgFont;
+extern gchar *GdmSoundProgram;
+extern gboolean GdmSoundOnLogin;
+extern gchar *GdmSoundOnLoginFile;
 
 void
 gdm_common_show_info_msg (void)
@@ -223,4 +226,21 @@ gdm_common_int_same (VeConfig *config, int cur, const char *key)
 	}
 }
 
+void
+gdm_common_login_sound (void)
+{
+	if ( ! GdmSoundOnLogin)
+		return;
 
+	if (ve_string_empty (g_getenv ("GDM_IS_LOCAL")) ||
+	    ve_string_empty (GdmSoundProgram) ||
+	    ve_string_empty (GdmSoundOnLoginFile) ||
+	    access (GdmSoundProgram, F_OK) != 0 ||
+	    access (GdmSoundOnLoginFile, F_OK) != 0) {
+		gdk_beep ();
+	} else {
+		/* login sound interruption */
+		printf ("%c%c%c\n", STX, BEL, GDM_INTERRUPT_LOGIN_SOUND);
+		fflush (stdout);
+	}
+}
diff --git a/gui/gdmcommon.h b/gui/gdmcommon.h
index c08a3d93..9d8cde49 100644
--- a/gui/gdmcommon.h
+++ b/gui/gdmcommon.h
@@ -40,6 +40,8 @@ gboolean gdm_common_bool_same		(VeConfig *config,
 gboolean gdm_common_int_same		(VeConfig *config,
 					 int cur, const char *key);
 
+void	gdm_common_login_sound		(void);
+
 /* The greeter defines this, we just call it from here */
 void	gdm_kill_thingies		(void);
 
diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c
index 196ae820..feded984 100644
--- a/gui/gdmlogin.c
+++ b/gui/gdmlogin.c
@@ -124,6 +124,10 @@ static gint GdmPositionX;
 static gint GdmPositionY;
 static gboolean GdmTitleBar;
 
+gboolean GdmSoundOnLogin;
+gchar *GdmSoundOnLoginFile;
+gchar *GdmSoundProgram;
+
 static gboolean GdmShowGnomeFailsafeSession;
 static gboolean GdmShowXtermFailsafeSession;
 static gboolean GdmShowLastSession;
@@ -716,6 +720,10 @@ gdm_login_parse_config (void)
     GdmFlexiReapDelayMinutes = ve_config_get_int (config, GDM_KEY_FLEXI_REAP_DELAY_MINUTES);
     GdmUse24Clock = ve_config_get_bool (config, GDM_KEY_USE_24_CLOCK);
 
+    GdmSoundOnLogin = ve_config_get_bool (config, GDM_KEY_SOUND_ON_LOGIN);
+    GdmSoundOnLoginFile = ve_config_get_string (config, GDM_KEY_SOUND_ON_LOGIN_FILE);
+    GdmSoundProgram = ve_config_get_string (config, GDM_KEY_SOUND_PROGRAM);
+
     if (GdmIconMaxWidth < 0) GdmIconMaxWidth = 128;
     if (GdmIconMaxHeight < 0) GdmIconMaxHeight = 128;
     if (GdmXineramaScreen < 0) GdmXineramaScreen = 0;
@@ -1744,7 +1752,7 @@ gdm_login_ctrl_handler (GIOChannel *source, GIOCondition cond, gint fd)
 
 	tmp = ve_locale_to_utf8 (buf);
 	if (strcmp (tmp, _("Username:")) == 0) {
-		gdk_beep ();
+		gdm_common_login_sound ();
 		gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Username:"));
 	} else {
 		gtk_label_set_text (GTK_LABEL (label), tmp);
@@ -3506,6 +3514,10 @@ gdm_reread_config (int sig, gpointer data)
 		}
 	}
 
+	GdmSoundProgram = ve_config_get_string (config, GDM_KEY_SOUND_PROGRAM);
+	GdmSoundOnLogin = ve_config_get_bool (config, GDM_KEY_SOUND_ON_LOGIN);
+	GdmSoundOnLoginFile = ve_config_get_string (config, GDM_KEY_SOUND_ON_LOGIN_FILE);
+
 	GdmUse24Clock = ve_config_get_bool (config, GDM_KEY_USE_24_CLOCK);
 	update_clock (NULL);
 
diff --git a/gui/gdmsetup-strings.c b/gui/gdmsetup-strings.c
index 5412dc3e..38abc95b 100644
--- a/gui/gdmsetup-strings.c
+++ b/gui/gdmsetup-strings.c
@@ -68,11 +68,23 @@ gchar *s = N_("Allow root to login r_emotely with GDM");
 gchar *s = N_("Allow remote _timed logins");
 gchar *s = N_("Show the \"Actions\" menu (formerly known as the \"System\" menu).  If not set, none of the system commands will be available (this includes reboot, shutdown, configure, chooser)");
 gchar *s = N_("Show _actions menu");
+gchar *s = N_("    ");
 gchar *s = N_("Allow c_onfiguration from the login screen");
+gchar *s = N_("    ");
 gchar *s = N_("Allo_w running XDMCP chooser from the login screen");
 gchar *s = N_("Always disallow TCP connections to _X server (disables all remote connections)");
 gchar *s = N_("Retry _delay (seconds) :");
 gchar *s = N_("Security");
+gchar *s = N_("Options");
+gchar *s = N_("    ");
+gchar *s = N_("Enable _accessibility modules");
+gchar *s = N_("Make a _sound when login window is ready");
+gchar *s = N_("    ");
+gchar *s = N_("acc_sound_file_box");
+gchar *s = N_("Sound _file:");
+gchar *s = N_("*");
+gchar *s = N_("_Test sound");
+gchar *s = N_("Accessibility");
 gchar *s = N_("No XDMCP support in the binary.  To enable XDMCP support you must recompile GDM with the XDMCP libraries.");
 gchar *s = N_("Enable _XDMCP");
 gchar *s = N_("    ");
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index 436342be..633592ac 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -51,6 +51,7 @@ static gboolean RUNNING_UNDER_GDM = FALSE;
 
 static gboolean gdm_running = FALSE;
 static int GdmMinimalUID = 100;
+static char *GdmSoundProgram = NULL;
 
 static GladeXML *xml;
 
@@ -565,6 +566,27 @@ setup_intspin (const char *name,
 			  G_CALLBACK (intspin_changed), NULL);
 }
 
+static void
+setup_notify_entry (const char *name,
+		       const char *key)
+{
+	GtkWidget *entry = glade_helper_get (xml, name, GTK_TYPE_ENTRY);
+	char *val;
+
+	val = ve_config_get_string (ve_config_get (GDM_CONFIG_FILE), key);
+
+	g_object_set_data_full (G_OBJECT (entry),
+				"key", g_strdup (key),
+				(GDestroyNotify) g_free);
+
+	gtk_entry_set_text (GTK_ENTRY (entry), ve_sure_string (val));
+
+	g_signal_connect (G_OBJECT (entry), "changed",
+			  G_CALLBACK (entry_changed), NULL);
+
+	g_free (val);
+}
+
 static gboolean
 greeter_toggle_timeout (GtkWidget *toggle)
 {
@@ -948,6 +970,204 @@ setup_xdmcp_support (void)
 }
 
 static void
+test_sound (GtkWidget *button, gpointer data)
+{
+	GtkEntry *entry = GTK_ENTRY (data);
+	const char *file = gtk_entry_get_text (GTK_ENTRY (entry));
+	const char *argv[3];
+
+	if (ve_string_empty (file) ||
+	    access (file, R_OK) != 0 ||
+	    ve_string_empty (GdmSoundProgram))
+	       return;
+
+	argv[0] = GdmSoundProgram;
+	argv[1] = file;
+	argv[2] = NULL;
+
+	g_spawn_async ("/" /* working directory */,
+		       (char **)argv,
+		       NULL /* envp */,
+		       0 /* flags */,
+		       NULL /* child setup */,
+		       NULL /* user data */,
+		       NULL /* child pid */,
+		       NULL /* error */);
+}
+
+static gboolean
+module_compare (const char *mod1, const char *mod2)
+{
+	char *base1;
+	char *base2;
+	char *p;
+	gboolean ret;
+
+	/* first cannonify the names */
+	base1 = g_path_get_basename (mod1);
+	base2 = g_path_get_basename (mod2);
+	if (strncmp (base1, "lib", 3) == 0)
+		strcpy (base1, &base1[3]);
+	if (strncmp (base2, "lib", 3) == 0)
+		strcpy (base2, &base2[3]);
+	p = strstr (base1, ".so");
+	if (p != NULL)
+		*p = '\0';
+	p = strstr (base2, ".so");
+	if (p != NULL)
+		*p = '\0';
+
+	ret = (strcmp (base1, base2) == 0);
+
+	g_free (base1);
+	g_free (base2);
+
+	return ret;
+}
+
+static gboolean
+modules_list_contains (const char *modules_list, const char *module)
+{
+	char **vec;
+	int i;
+
+	if (ve_string_empty (modules_list))
+		return FALSE;
+
+	vec = g_strsplit (modules_list, ":", -1);
+	if (vec == NULL)
+		return FALSE;
+
+	for (i = 0; vec[i] != NULL; i++) {
+		if (module_compare (vec[i], module)) {
+			g_strfreev (vec);
+			return TRUE;
+		}
+	}
+
+	g_strfreev (vec);
+	return FALSE;
+}
+
+static char *
+modules_list_remove (char *modules_list, const char *module)
+{
+	char **vec;
+	GString *str;
+	char *sep = "";
+	int i;
+
+	if (ve_string_empty (modules_list))
+		return g_strdup ("");
+
+	vec = g_strsplit (modules_list, ":", -1);
+	if (vec == NULL)
+		return g_strdup ("");
+
+	str = g_string_new (NULL);
+
+	for (i = 0; vec[i] != NULL; i++) {
+		if ( ! module_compare (vec[i], module)) {
+			g_string_append (str, sep);
+			sep = ":";
+			g_string_append (str, vec[i]);
+		}
+	}
+
+	g_strfreev (vec);
+
+	return g_string_free (str, FALSE);
+}
+
+static char *
+modules_list_add (char *modules_list, const char *module)
+{
+	char *n;
+	if (ve_string_empty (modules_list))
+		n = g_strdup (module);
+	else
+		n = g_strconcat (modules_list, ":", module, NULL);
+	g_free (modules_list);
+	return n;
+}
+
+static void
+acc_modules_toggled (GtkWidget *toggle, gpointer data)
+{
+	gboolean add_gtk_modules = ve_config_get_bool (ve_config_get (GDM_CONFIG_FILE),
+						       GDM_KEY_ADD_GTK_MODULES);
+	char *modules_list = ve_config_get_string (ve_config_get (GDM_CONFIG_FILE),
+						   GDM_KEY_GTK_MODULES_LIST);
+
+	/* first whack the modules from the list */
+	modules_list = modules_list_remove (modules_list, "gail");
+	modules_list = modules_list_remove (modules_list, "atk-bridge");
+	modules_list = modules_list_remove (modules_list, "dwellmouselistener");
+	modules_list = modules_list_remove (modules_list, "keymouselistener");
+
+	if (GTK_TOGGLE_BUTTON (toggle)->active) {
+		if ( ! add_gtk_modules) {
+			g_free (modules_list);
+			modules_list = NULL;
+		}
+
+		modules_list = modules_list_add (modules_list, "gail");
+		modules_list = modules_list_add (modules_list, "atk-bridge");
+		modules_list = modules_list_add (modules_list, EXPANDED_LIBDIR "/gtk-2.0/modules/libkeymouselistener");
+		modules_list = modules_list_add (modules_list, EXPANDED_LIBDIR "/gtk-2.0/modules/libdwellmouselistener");
+
+		add_gtk_modules = TRUE;
+	}
+
+	if (ve_string_empty (modules_list))
+		add_gtk_modules = FALSE;
+
+	ve_config_set_string (ve_config_get (GDM_CONFIG_FILE),
+			      GDM_KEY_GTK_MODULES_LIST,
+			      ve_sure_string (modules_list));
+	ve_config_set_bool (ve_config_get (GDM_CONFIG_FILE),
+			    GDM_KEY_ADD_GTK_MODULES,
+			    add_gtk_modules);
+
+	g_free (modules_list);
+
+	update_key (GDM_KEY_GTK_MODULES_LIST);
+	update_key (GDM_KEY_ADD_GTK_MODULES);
+}
+
+static void
+setup_accessibility_support (void)
+{
+	GtkWidget *acc_modules = glade_helper_get (xml, "acc_modules", GTK_TYPE_TOGGLE_BUTTON);
+	GtkWidget *acc_sound_test = glade_helper_get (xml, "acc_sound_test", GTK_TYPE_BUTTON);
+	GtkWidget *acc_sound_file_entry = glade_helper_get (xml, "acc_sound_file_entry", GTK_TYPE_ENTRY);
+
+	gboolean add_gtk_modules = ve_config_get_bool (ve_config_get (GDM_CONFIG_FILE),
+						       GDM_KEY_ADD_GTK_MODULES);
+	char *modules_list = ve_config_get_string (ve_config_get (GDM_CONFIG_FILE),
+						   GDM_KEY_GTK_MODULES_LIST);
+
+	if (add_gtk_modules &&
+	    modules_list_contains (modules_list, "gail") &&
+	    modules_list_contains (modules_list, "atk-bridge") &&
+	    modules_list_contains (modules_list, "dwellmouselistener") &&
+	    modules_list_contains (modules_list, "keymouselistener")) {
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (acc_modules),
+					      TRUE);
+	} else {
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (acc_modules),
+					      FALSE);
+	}
+
+	g_signal_connect (G_OBJECT (acc_modules), "toggled",
+			  G_CALLBACK (acc_modules_toggled),
+			  NULL);
+	g_signal_connect (G_OBJECT (acc_sound_test), "clicked",
+			  G_CALLBACK (test_sound),
+			  acc_sound_file_entry);
+}
+
+static void
 background_toggled (void)
 {
 	GtkWidget *no_bg = glade_helper_get (xml, "sg_no_bg_rb", GTK_TYPE_TOGGLE_BUTTON);
@@ -2148,8 +2368,11 @@ setup_gui (void)
 	glade_helper_tagify_label (xml, "gg_desc_label", "b");
 	glade_helper_tagify_label (xml, "gg_copyright_label", "b");
 
+	glade_helper_tagify_label (xml, "acc_options_cat_label", "b");
+
 	glade_helper_tagify_label (xml, "enable_xdmcp", "b");
 
+	setup_accessibility_support ();
 	setup_xdmcp_support ();
 	setup_background_support ();
 	setup_greeter_backselect ();
@@ -2227,10 +2450,18 @@ setup_gui (void)
 			     GDM_KEY_DISALLOWTCP,
 			     GDM_KEY_DISALLOWTCP /* notify_key */);
 
-	/* setup sensitivities */
+	/* security sensitivities */
 	setup_sensitivity_positive_toggle ("sysmenu", "config_available");
 	setup_sensitivity_positive_toggle ("sysmenu", "chooser_button");
 
+	setup_greeter_toggle ("acc_beep",
+			      GDM_KEY_SOUND_ON_LOGIN);
+	setup_notify_entry ("acc_sound_file_entry",
+			    GDM_KEY_SOUND_ON_LOGIN_FILE);
+
+	/* accesibility sensitivities */
+	setup_sensitivity_positive_toggle ("acc_beep", "acc_sound_file_box");
+
 	setup_notify_toggle ("enable_xdmcp",
 			     GDM_KEY_XDMCP,
 			     GDM_KEY_XDMCP /* notify_key */);
@@ -2485,6 +2716,13 @@ main (int argc, char *argv[])
 	 * ui?  Say it ain't so.  Our config sections are SUCH A MESS */
 	GdmMinimalUID = ve_config_get_int (ve_config_get (GDM_CONFIG_FILE),
 					   GDM_KEY_MINIMALUID);
+	GdmSoundProgram = ve_config_get_string (ve_config_get (GDM_CONFIG_FILE),
+						GDM_KEY_SOUND_PROGRAM);
+	if (ve_string_empty (GdmSoundProgram) ||
+	    access (GdmSoundProgram, X_OK) != 0) {
+		g_free (GdmSoundProgram);
+		GdmSoundProgram = NULL;
+	}
 
 	setup_gui ();
 
diff --git a/gui/gdmsetup.glade b/gui/gdmsetup.glade
index c8f597f2..3ffbcb32 100644
--- a/gui/gdmsetup.glade
+++ b/gui/gdmsetup.glade
@@ -1918,33 +1918,101 @@ widget</property>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="config_available">
+			    <widget class="GtkHBox" id="hbox17">
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Allow c_onfiguration from the login screen</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label62">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">    </property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</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="config_available">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Allow c_onfiguration from the login screen</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</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>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="chooser_button">
+			    <widget class="GtkHBox" id="hbox18">
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Allo_w running XDMCP chooser from the login screen</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label63">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">    </property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</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="chooser_button">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Allo_w running XDMCP chooser from the login screen</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</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>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -2078,6 +2146,274 @@ widget</property>
 	  </child>
 
 	  <child>
+	    <widget class="GtkVBox" id="vbox20">
+	      <property name="border_width">5</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">18</property>
+
+	      <child>
+		<widget class="GtkVBox" id="vbox21">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="acc_options_cat_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Options</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox16">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkLabel" id="label61">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">    </property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox22">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="acc_modules">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Enable _accessibility modules</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</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="acc_beep">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Make a _sound when login window is ready</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</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="GtkHBox" id="hbox19">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label64">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">    </property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkHBox" id="acc_sound_file_box">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">12</property>
+				  <accessibility>
+				    <atkproperty name="AtkObject::accessible_name" translatable="yes">acc_sound_file_box</atkproperty>
+				  </accessibility>
+
+				  <child>
+				    <widget class="GtkLabel" id="label65">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Sound _file:</property>
+				      <property name="use_underline">True</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="mnemonic_widget">acc_sound_file_entry</property>
+				      <accessibility>
+					<atkrelation target="acc_sound_test" type="label-for"/>
+					<atkrelation target="acc_sound_file_entry" type="label-for"/>
+				      </accessibility>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GnomeFileEntry" id="acc_sound_file">
+				      <property name="visible">True</property>
+				      <property name="max_saved">10</property>
+				      <property name="directory_entry">False</property>
+				      <property name="modal">False</property>
+
+				      <child internal-child="entry">
+					<widget class="GtkEntry" id="acc_sound_file_entry">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="editable">True</property>
+					  <property name="visibility">True</property>
+					  <property name="max_length">0</property>
+					  <property name="text" translatable="yes"></property>
+					  <property name="has_frame">True</property>
+					  <property name="invisible_char" translatable="yes">*</property>
+					  <property name="activates_default">False</property>
+					</widget>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkButton" id="acc_sound_test">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">_Test sound</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label59">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Accessibility</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
 	    <widget class="GtkVBox" id="vbox1">
 	      <property name="border_width">5</property>
 	      <property name="visible">True</property>
diff --git a/gui/greeter/greeter.c b/gui/greeter/greeter.c
index 96222f52..8c00341a 100644
--- a/gui/greeter/greeter.c
+++ b/gui/greeter/greeter.c
@@ -73,6 +73,9 @@ gchar *GdmServAuthDir;
 gchar *GdmInfoMsgFile;
 gchar *GdmInfoMsgFont;
 gint GdmFlexiReapDelayMinutes;
+gboolean GdmSoundOnLogin;
+gchar *GdmSoundOnLoginFile;
+gchar *GdmSoundProgram;
 
 gboolean GdmUseCirclesInEntry = FALSE;
 
@@ -194,6 +197,10 @@ greeter_parse_config (void)
     GdmGlobalFaceDir = ve_config_get_string (config, GDM_KEY_FACEDIR);
     GdmDefaultFace = ve_config_get_string (config, GDM_KEY_FACE);
 
+    GdmSoundProgram = ve_config_get_string (config, GDM_KEY_SOUND_PROGRAM);
+    GdmSoundOnLogin = ve_config_get_bool (config, GDM_KEY_SOUND_ON_LOGIN);
+    GdmSoundOnLoginFile = ve_config_get_string (config, GDM_KEY_SOUND_ON_LOGIN_FILE);
+
     if (GdmXineramaScreen < 0)
       GdmXineramaScreen = 0;
     if (GdmIconMaxWidth < 0) GdmIconMaxWidth = 128;
@@ -261,7 +268,7 @@ greeter_ctrl_handler (GIOChannel *source,
 
 	tmp = ve_locale_to_utf8 (buf);
 	if (tmp != NULL && strcmp (tmp, _("Username:")) == 0) {
-		gdk_beep ();
+		gdm_common_login_sound ();
 		greeter_probably_login_prompt = TRUE;
 	} else {
 		greeter_probably_login_prompt = FALSE;
@@ -818,9 +825,13 @@ greeter_reread_config (int sig, gpointer data)
 		_exit (DISPLAY_RESTARTGREETER);
 	}
 
+	GdmSoundProgram = ve_config_get_string (config, GDM_KEY_SOUND_PROGRAM);
+	GdmSoundOnLogin = ve_config_get_bool (config, GDM_KEY_SOUND_ON_LOGIN);
+	GdmSoundOnLoginFile = ve_config_get_string (config, GDM_KEY_SOUND_ON_LOGIN_FILE);
+
 	if ( ! gdm_common_bool_same (config,
-			  GdmUse24Clock,
-			  GDM_KEY_USE_24_CLOCK)) {
+				     GdmUse24Clock,
+				     GDM_KEY_USE_24_CLOCK)) {
 		GdmUse24Clock = ve_config_get_bool (config,
 						    GDM_KEY_USE_24_CLOCK);
 		greeter_item_clock_update ();
diff --git a/gui/greeter/greeter_configuration.h b/gui/greeter/greeter_configuration.h
index bb3c5198..79df729b 100644
--- a/gui/greeter/greeter_configuration.h
+++ b/gui/greeter/greeter_configuration.h
@@ -32,6 +32,9 @@ extern gchar *GdmWelcome;
 extern gchar *GdmServAuthDir;
 extern gchar *GdmInfoMsgFile;
 extern gchar *GdmInfoMsgFont;
+extern gchar *GdmSoundProgram;
+extern gchar *GdmSoundOnLoginFile;
+extern gboolean GdmSoundOnLogin;
 
 extern gboolean GDM_IS_LOCAL;
 extern gboolean DOING_GDM_DEVELOPMENT;