Use the new ve_hig_dialog_new interface to set the markup flag where

Fri Sep 19 15:34:36 2003  George Lebl <jirka@5z.com>

	* gui/gdmXnestchooser.c, gui/gdmchooser.c, gui/gdmcomm.c,
 	  gui/gdmflexiserver.c, gui/gdmlogin.c, gui/gdmphotosetup.c,
	  gui/gdmsetup.c, gui/greeter/greeter.[ch],
	  gui/greeter/greeter_action_language.c,
	  gui/greeter/greeter_item_pam.c, gui/greeter/greeter_session.c,
	  gui/greeter/greeter_system.c: Use the new ve_hig_dialog_new
	  interface to set the markup flag where appropriate fixing
	  #122683

	* gui/gdmphotosetup.c, gui/gdmsetup.c: convert filenames
	  to utf8 before displaying them.

14 files changed, 95 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ccf6514..db326cc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Fri Sep 19 15:34:36 2003  George Lebl <jirka@5z.com>
+
+	* gui/gdmXnestchooser.c, gui/gdmchooser.c, gui/gdmcomm.c,
+ 	  gui/gdmflexiserver.c, gui/gdmlogin.c, gui/gdmphotosetup.c,
+	  gui/gdmsetup.c, gui/greeter/greeter.[ch],
+	  gui/greeter/greeter_action_language.c,
+	  gui/greeter/greeter_item_pam.c, gui/greeter/greeter_session.c,
+	  gui/greeter/greeter_system.c: Use the new ve_hig_dialog_new
+	  interface to set the markup flag where appropriate fixing
+	  #122683
+
+	* gui/gdmphotosetup.c, gui/gdmsetup.c: convert filenames
+	  to utf8 before displaying them.
+
 Fri Sep 19 13:41:37 2003  George Lebl <jirka@5z.com>
 
 	* config/Makefile.am, config/default.desktop.in:  Rename
diff --git a/gui/gdmXnestchooser.c b/gui/gdmXnestchooser.c
index 53743c17..22f3ca90 100644
--- a/gui/gdmXnestchooser.c
+++ b/gui/gdmXnestchooser.c
@@ -483,6 +483,7 @@ main (int argc, char *argv[])
 				       GTK_DIALOG_MODAL /* flags */,
 				       GTK_MESSAGE_ERROR,
 				       GTK_BUTTONS_OK,
+				       FALSE /* markup */,
 				       _("Xnest doesn't exist."),
 				       "%s",
 				       _("Please ask your system "
@@ -510,6 +511,7 @@ main (int argc, char *argv[])
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_ERROR,
 				 GTK_BUTTONS_OK,
+				 FALSE /* markup */,
 				 _("Indirect XDMCP is not enabled"),
 				 "%s",
 				 _("Please ask your "
@@ -530,6 +532,7 @@ main (int argc, char *argv[])
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_ERROR,
 				 GTK_BUTTONS_OK,
+				 FALSE /* markup */,
 				 _("XDMCP is not enabled"),
 				 "%s",
 				 _("Please ask your "
@@ -560,6 +563,7 @@ main (int argc, char *argv[])
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_ERROR,
 				 GTK_BUTTONS_OK,
+				 FALSE /* markup */,
 				 _("GDM is not running"),
 				 "%s",
 				 _("Please ask your "
@@ -578,6 +582,7 @@ main (int argc, char *argv[])
 				       GTK_DIALOG_MODAL /* flags */,
 				       GTK_MESSAGE_ERROR,
 				       GTK_BUTTONS_OK,
+				       FALSE /* markup */,
 				       _("Could not find a free "
 					 "display number"),
 				       /* avoid warning */ "%s", "");
diff --git a/gui/gdmchooser.c b/gui/gdmchooser.c
index fe482438..f057954b 100644
--- a/gui/gdmchooser.c
+++ b/gui/gdmchooser.c
@@ -481,6 +481,7 @@ gdm_chooser_decode_packet (GIOChannel   *source,
 		     GTK_DIALOG_MODAL /* flags */,
 		     GTK_MESSAGE_ERROR,
 		     GTK_BUTTONS_OK,
+		     FALSE /* markup */,
 		     _("Cannot connect to remote server"),
 		     _("The host \"%s\" is not willing "
 		       "to support a login session right now.  "
@@ -848,6 +849,7 @@ add_check (gpointer data)
 			 GTK_DIALOG_MODAL /* flags */,
 			 GTK_MESSAGE_ERROR,
 			 GTK_BUTTONS_OK,
+			 FALSE /* markup */,
 			 _("Did not receive response from server"),
 			 _("Did not receive any response from host \"%s\" "
 			   "in %d seconds.  Perhaps the host is not "
@@ -901,6 +903,7 @@ gdm_chooser_add_host (void)
 			 GTK_DIALOG_MODAL /* flags */,
 			 GTK_MESSAGE_ERROR,
 			 GTK_BUTTONS_OK,
+			 FALSE /* markup */,
 			 _("Cannot find host"),
 			 _("I cannot find the host \"%s\", "
 			   "perhaps you have mistyped it."),
@@ -1524,6 +1527,7 @@ main (int argc, char *argv[])
 					GTK_DIALOG_MODAL /* flags */,
 					GTK_MESSAGE_ERROR,
 					GTK_BUTTONS_OK,
+					FALSE /* markup */,
 					_("Cannot run chooser"),
 					_("The chooser version (%s) does not match the daemon "
 					  "version (%s).  "
diff --git a/gui/gdmcomm.c b/gui/gdmcomm.c
index b81a13c1..c738582b 100644
--- a/gui/gdmcomm.c
+++ b/gui/gdmcomm.c
@@ -389,6 +389,7 @@ gdmcomm_check (gboolean gui_bitching)
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_WARNING,
 				 GTK_BUTTONS_OK,
+				 FALSE /* markup */,
 				 _("GDM (The GNOME Display Manager) "
 				   "is not running."),
 				 "%s\n%s",
@@ -413,6 +414,7 @@ gdmcomm_check (gboolean gui_bitching)
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_WARNING,
 				 GTK_BUTTONS_OK,
+				 FALSE /* markup */,
 				 _("Cannot communicate with GDM "
 				   "(The GNOME Display Manager)"),
 				 "%s",
diff --git a/gui/gdmflexiserver.c b/gui/gdmflexiserver.c
index f2800437..c4933bce 100644
--- a/gui/gdmflexiserver.c
+++ b/gui/gdmflexiserver.c
@@ -250,6 +250,7 @@ main (int argc, char *argv[])
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_ERROR,
 				 GTK_BUTTONS_OK,
+				 FALSE /* markup */,
 				 _("Cannot communicate with GDM "
 				   "(The GNOME Display Manager)"),
 				 "%s",
@@ -270,6 +271,7 @@ main (int argc, char *argv[])
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_ERROR,
 				 GTK_BUTTONS_OK,
+				 FALSE /* markup */,
 				 _("You do not seem to have the "
 				   "authentication needed for this "
 				   "operation"),
@@ -299,6 +301,7 @@ main (int argc, char *argv[])
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_ERROR,
 				 GTK_BUTTONS_OK,
+				 FALSE /* markup */,
 				 _("You do not seem to be logged in on the "
 				   "console"),
 				 "%s",
@@ -348,6 +351,7 @@ main (int argc, char *argv[])
 		 GTK_DIALOG_MODAL /* flags */,
 		 GTK_MESSAGE_ERROR,
 		 GTK_BUTTONS_OK,
+		 FALSE /* markup */,
 		 _("Cannot start new display"),
 		 "%s", message);
 
diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c
index c56ff7ee..9188d799 100644
--- a/gui/gdmlogin.c
+++ b/gui/gdmlogin.c
@@ -524,6 +524,7 @@ gdm_login_message (const gchar *msg)
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_INFO,
 				 GTK_BUTTONS_OK,
+				 FALSE /* markup */,
 				 msg,
 				 /* avoid warning */ "%s", "");
 
@@ -536,7 +537,7 @@ gdm_login_message (const gchar *msg)
 }
 
 static gboolean
-gdm_login_query (const gchar *msg, const char *posbutton, const char *negbutton)
+gdm_login_query (const gchar *msg, gboolean markup, const char *posbutton, const char *negbutton)
 {
 	int ret;
 	GtkWidget *req;
@@ -549,6 +550,7 @@ gdm_login_query (const gchar *msg, const char *posbutton, const char *negbutton)
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_QUESTION,
 				 GTK_BUTTONS_NONE,
+				 markup,
 				 msg,
 				 /* avoid warning */ "%s", "");
 
@@ -594,6 +596,7 @@ gdm_run_command (const char *command)
 					    GTK_DIALOG_MODAL /* flags */,
 					    GTK_MESSAGE_ERROR,
 					    GTK_BUTTONS_OK,
+					    FALSE /* markup */,
 					    _("Could not fork a new process!"),
 					    "%s",
 					    _("You likely won't be able to log "
@@ -641,6 +644,7 @@ static void
 gdm_login_reboot_handler (void)
 {
 	if (gdm_login_query (_("Are you sure you want to reboot the machine?"),
+			     FALSE /* markup */,
 			     _("_Reboot"), GTK_STOCK_CANCEL)) {
 		closelog();
 
@@ -654,6 +658,7 @@ static void
 gdm_login_halt_handler (void)
 {
 	if (gdm_login_query (_("Are you sure you want to shut down the machine?"),
+			     FALSE /* markup */,
 			     _("Shut _Down"), GTK_STOCK_CANCEL)) {
 		closelog();
 
@@ -675,6 +680,7 @@ static void
 gdm_login_suspend_handler (void)
 {
 	if (gdm_login_query (_("Are you sure you want to suspend the machine?"),
+			     FALSE /* markup */,
 			     _("_Suspend"), GTK_STOCK_CANCEL)) {
 		/* suspend interruption */
 		printf ("%c%c%c\n", STX, BEL, GDM_INTERRUPT_SUSPEND);
@@ -893,7 +899,7 @@ gdm_login_session_lookup (const gchar* savedsess)
 				     "future sessions?"),
                                    session_name (savedsess),
                                    session_name (defsess));	    
-	    savesess = gdm_login_query (msg, _("Make _Default"), _("Just _Log In"));
+	    savesess = gdm_login_query (msg, FALSE /* markup */, _("Make _Default"), _("Just _Log In"));
 	    g_free (msg);
 	}
     }
@@ -920,7 +926,7 @@ gdm_login_session_lookup (const gchar* savedsess)
                                                session_name (session),
                                                session_name (savedsess),
                                                session_name (session));
-			savesess = gdm_login_query (msg, _("Make _Default"), _("Just For _This Session"));
+			savesess = gdm_login_query (msg, FALSE /* markup */, _("Make _Default"), _("Just For _This Session"));
                 } else if (strcmp (session, "Xclients.desktop") != 0 &&
                            strcmp (session, LAST_SESSION) != 0) {
                         /* if !GdmShowLastSession then our saved session is
@@ -995,7 +1001,7 @@ gdm_login_language_lookup (const gchar* savedlang)
 	    g_free (curname);
 	    g_free (savedname);
 
-	    savelang = gdm_login_query (msg, _("Make _Default"), _("Just For _This Session"));
+	    savelang = gdm_login_query (msg, TRUE /* markup */, _("Make _Default"), _("Just For _This Session"));
 	    g_free (msg);
 	}
     } else {
@@ -1926,6 +1932,7 @@ gdm_login_ctrl_handler (GIOChannel *source, GIOCondition cond, gint fd)
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_ERROR,
 				 GTK_BUTTONS_OK,
+				 FALSE /* markup */,
 				 tmp,
 				 /* avoid warning */ "%s", "");
 	g_free (tmp);
@@ -2047,6 +2054,7 @@ gdm_login_ctrl_handler (GIOChannel *source, GIOCondition cond, gint fd)
 					 GTK_DIALOG_MODAL /* flags */,
 					 GTK_MESSAGE_INFO,
 					 GTK_BUTTONS_OK,
+					 FALSE /* markup */,
 					 /* translators:  This is a nice and evil eggie text, translate
 					  * to your favourite currency */
 					 _("Please insert 25 cents "
@@ -2075,6 +2083,7 @@ gdm_login_ctrl_handler (GIOChannel *source, GIOCondition cond, gint fd)
 						 GTK_DIALOG_MODAL /* flags */,
 						 GTK_MESSAGE_INFO,
 						 GTK_BUTTONS_OK,
+						 FALSE /* markup */,
 						 oldtext,
 						 /* avoid warning */ "%s", "");
 			gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
@@ -3717,6 +3726,7 @@ main (int argc, char *argv[])
 					GTK_DIALOG_MODAL /* flags */,
 					GTK_MESSAGE_ERROR,
 					GTK_BUTTONS_OK,
+					FALSE /* markup */,
 					_("Cannot start the greeter"),
 					_("The greeter version (%s) does not match the daemon "
 					  "version.  "
@@ -3747,6 +3757,7 @@ main (int argc, char *argv[])
 					GTK_DIALOG_MODAL /* flags */,
 					GTK_MESSAGE_WARNING,
 					GTK_BUTTONS_NONE,
+					FALSE /* markup */,
 					_("Cannot start the greeter"),
 					_("The greeter version (%s) does not match the daemon "
 					  "version.  "
@@ -3790,6 +3801,7 @@ main (int argc, char *argv[])
 					GTK_DIALOG_MODAL /* flags */,
 					GTK_MESSAGE_WARNING,
 					GTK_BUTTONS_NONE,
+					FALSE /* markup */,
 					_("Cannot start the greeter"),
 					_("The greeter version (%s) does not match the daemon "
 					  "version (%s).  "
@@ -3949,6 +3961,7 @@ main (int argc, char *argv[])
 					GTK_DIALOG_MODAL /* flags */,
 					GTK_MESSAGE_ERROR,
 					GTK_BUTTONS_OK,
+					FALSE /* markup */,
 					_("Session directory is missing"),
 					"%s",
 					_("Your session directory is missing or empty!  "
@@ -3974,6 +3987,7 @@ main (int argc, char *argv[])
 					GTK_DIALOG_MODAL /* flags */,
 					GTK_MESSAGE_ERROR,
 					GTK_BUTTONS_OK,
+					FALSE /* markup */,
 					_("Configuration is not correct"),
 					"%s",
 					_("The configuration file contains an invalid command "
@@ -4000,6 +4014,7 @@ main (int argc, char *argv[])
 					GTK_DIALOG_MODAL /* flags */,
 					GTK_MESSAGE_ERROR,
 					GTK_BUTTONS_OK,
+					FALSE /* markup */,
 					_("No configuration was found"),
 					"%s",
 					_("The configuration was not found.  GDM is using "
diff --git a/gui/gdmphotosetup.c b/gui/gdmphotosetup.c
index e9bdaeae..cd0aeae6 100644
--- a/gui/gdmphotosetup.c
+++ b/gui/gdmphotosetup.c
@@ -63,6 +63,7 @@ gdm_check (void)
 			 GTK_DIALOG_MODAL /* flags */,
 			 GTK_MESSAGE_WARNING,
 			 GTK_BUTTONS_OK,
+			 FALSE /* markup */,
 			 _("GDM (The GNOME Display Manager) "
 			   "is not running."),
 			 "%s\n%s",
@@ -136,6 +137,7 @@ main (int argc, char *argv[])
 				       GTK_DIALOG_MODAL /* flags */,
 				       GTK_MESSAGE_WARNING,
 				       GTK_BUTTONS_OK,
+				       FALSE /* markup */,
 				       _("The face browser is not "
 					 "configured"),
 				       "%s",
@@ -197,6 +199,7 @@ main (int argc, char *argv[])
 					       GTK_DIALOG_MODAL /* flags */,
 					       GTK_MESSAGE_WARNING,
 					       GTK_BUTTONS_OK,
+					       FALSE /* markup */,
 					       _("No picture selected."),
 					       /* avoid warning */ "%s", "");
 			gtk_dialog_run (GTK_DIALOG (d));
@@ -207,6 +210,7 @@ main (int argc, char *argv[])
 					       GTK_DIALOG_MODAL /* flags */,
 					       GTK_MESSAGE_WARNING,
 					       GTK_BUTTONS_OK,
+					       FALSE /* markup */,
 					       _("Picture is too large"),
 					       _("The system administrator "
 						 "disallowed pictures larger "
@@ -229,15 +233,18 @@ main (int argc, char *argv[])
 			fdsrc = open (pixmap, O_RDONLY);
 			if (fdsrc < 0) {
 				GtkWidget *d;
+				char *tmp = ve_filename_to_utf8 (pixmap);
 				d = ve_hig_dialog_new (NULL /* parent */,
 						       GTK_DIALOG_MODAL /* flags */,
 						       GTK_MESSAGE_ERROR,
 						       GTK_BUTTONS_OK,
+						       FALSE /* markup */,
 						       _("Cannot open file"),
 						       _("File %s cannot be open for "
 							 "reading\nError: %s"),
-						       pixmap,
+						       tmp,
 						       g_strerror (errno));
+				g_free (tmp);
 				gtk_dialog_run (GTK_DIALOG (d));
 				gtk_widget_destroy (d);
 				g_free (cfg_file);
@@ -248,15 +255,18 @@ main (int argc, char *argv[])
 			fddest = open (photofile, O_WRONLY | O_CREAT);
 			if (fddest < 0) {
 				GtkWidget *d;
+				char *tmp = ve_filename_to_utf8 (photofile);
 				d = ve_hig_dialog_new (NULL /* parent */,
 						       GTK_DIALOG_MODAL /* flags */,
 						       GTK_MESSAGE_ERROR,
 						       GTK_BUTTONS_OK,
+						       FALSE /* markup */,
 						       _("Cannot open file"),
 						       _("File %s cannot be open for "
 							 "writing\nError: %s"),
-						       photofile,
+						       tmp,
 						       g_strerror (errno));
+				g_free (tmp);
 				gtk_dialog_run (GTK_DIALOG (d));
 				gtk_widget_destroy (d);
 				g_free (cfg_file);
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index a1434e02..1824deed 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -142,6 +142,7 @@ check_update_error:
 						GTK_DIALOG_DESTROY_WITH_PARENT,
 						GTK_MESSAGE_ERROR,
 						GTK_BUTTONS_OK,
+						FALSE /* markup */,
 						_("An error occured while "
 						  "trying to contact the "
 						  "login screens.  Not all "
@@ -1584,6 +1585,7 @@ install_ok (GtkWidget *button, gpointer data)
 					   GTK_DIALOG_DESTROY_WITH_PARENT,
 					   GTK_MESSAGE_ERROR,
 					   GTK_BUTTONS_OK,
+					   FALSE /* markup */,
 					   _("No file selected"),
 					   /* avoid warning */ "%s", "");
 		gtk_dialog_run (GTK_DIALOG (dlg));
@@ -1611,6 +1613,7 @@ install_ok (GtkWidget *button, gpointer data)
 					   GTK_DIALOG_DESTROY_WITH_PARENT,
 					   GTK_MESSAGE_ERROR,
 					   GTK_BUTTONS_OK,
+					   FALSE /* markup */,
 					   _("Not a theme archive"),
 					   _("Details: %s"),
 					   error);
@@ -1623,7 +1626,7 @@ install_ok (GtkWidget *button, gpointer data)
 	}
 
 	if (dir_exists (theme_dir, dir)) {
-		char *fname = g_filename_to_utf8 (dir, -1, NULL, NULL, NULL);
+		char *fname = ve_filename_to_utf8 (dir);
 		char *s;
 		GtkWidget *button;
 		GtkWidget *dlg;
@@ -1639,6 +1642,7 @@ install_ok (GtkWidget *button, gpointer data)
 			 GTK_DIALOG_DESTROY_WITH_PARENT,
 			 GTK_MESSAGE_QUESTION,
 			 GTK_BUTTONS_NONE,
+			 FALSE /* markup */,
 			 s,
 			 /* avoid warning */ "%s", "");
 		g_free (fname);
@@ -1706,6 +1710,7 @@ install_ok (GtkWidget *button, gpointer data)
 					   GTK_DIALOG_DESTROY_WITH_PARENT,
 					   GTK_MESSAGE_ERROR,
 					   GTK_BUTTONS_OK,
+					   FALSE /* markup */,
 					   _("Some error occured when "
 					     "installing the theme"),
 					   /* avoid warning */ "%s", "");
@@ -1828,6 +1833,7 @@ delete_theme (GtkWidget *button, gpointer data)
 		 GTK_DIALOG_DESTROY_WITH_PARENT,
 		 GTK_MESSAGE_QUESTION,
 		 GTK_BUTTONS_NONE,
+		 FALSE /* markup */,
 		 s,
 		 /* avoid warning */ "%s", "");
 	g_free (s);
@@ -2414,6 +2420,7 @@ main (int argc, char *argv[])
 					   GTK_DIALOG_MODAL /* flags */,
 					   GTK_MESSAGE_ERROR,
 					   GTK_BUTTONS_OK,
+					   FALSE /* markup */,
 					   _("You must be the superuser (root) to configure GDM."),
 					   /* avoid warning */ "%s", "");
 		if (RUNNING_UNDER_GDM)
diff --git a/gui/greeter/greeter.c b/gui/greeter/greeter.c
index 357ef258..3ba784cc 100644
--- a/gui/greeter/greeter.c
+++ b/gui/greeter/greeter.c
@@ -316,6 +316,7 @@ greeter_ctrl_handler (GIOChannel *source,
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_ERROR,
 				 GTK_BUTTONS_OK,
+				 FALSE /* markup */,
 				 tmp,
 				 /* avoid warning */ "%s", "");
 	g_free (tmp);
@@ -411,6 +412,7 @@ greeter_ctrl_handler (GIOChannel *source,
 					 GTK_DIALOG_MODAL /* flags */,
 					 GTK_MESSAGE_INFO,
 					 GTK_BUTTONS_OK,
+					 FALSE /* markup */,
 					 /* translators:  This is a nice and evil eggie text, translate
 					  * to your favourite currency */
 					 _("Please insert 25 cents "
@@ -615,6 +617,7 @@ verify_gdm_version (void)
 				  GTK_DIALOG_MODAL /* flags */,
 				  GTK_MESSAGE_ERROR,
 				  GTK_BUTTONS_OK,
+				  FALSE /* markup */,
 				  _("Cannot start the greeter"),
 				  _("The greeter version (%s) does not match the daemon "
 				    "version.\n"
@@ -645,6 +648,7 @@ verify_gdm_version (void)
 				  GTK_DIALOG_MODAL /* flags */,
 				  GTK_MESSAGE_WARNING,
 				  GTK_BUTTONS_NONE,
+				  FALSE /* markup */,
 				  _("Cannot start the greeter"),
 				  _("The greeter version (%s) does not match the daemon "
 				    "version.\n"
@@ -689,6 +693,7 @@ verify_gdm_version (void)
 				  GTK_DIALOG_MODAL /* flags */,
 				  GTK_MESSAGE_WARNING,
 				  GTK_BUTTONS_NONE,
+				  FALSE /* markup */,
 				  _("Cannot start the greeter"),
 				  _("The greeter version (%s) does not match the daemon "
 				    "version (%s).\n"
@@ -741,6 +746,7 @@ greeter_message (const gchar *msg)
 			   GTK_DIALOG_MODAL /* flags */,
 			   GTK_MESSAGE_INFO,
 			   GTK_BUTTONS_OK,
+			   FALSE /* markup */,
 			   msg,
 			   /* avoid warning */ "%s", "");
   
@@ -755,7 +761,7 @@ greeter_message (const gchar *msg)
 
 
 gboolean
-greeter_query (const gchar *msg, const char *posbutton, const char *negbutton)
+greeter_query (const gchar *msg, gboolean markup, const char *posbutton, const char *negbutton)
 {
 	int ret;
 	GtkWidget *req;
@@ -768,6 +774,7 @@ greeter_query (const gchar *msg, const char *posbutton, const char *negbutton)
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_QUESTION,
 				 GTK_BUTTONS_NONE,
+				 markup,
 				 msg,
 				 /* avoid warning */ "%s", "");
 
@@ -1242,17 +1249,20 @@ main (int argc, char *argv[])
       {
         GtkWidget *dialog;
 	char *s;
+	char *tmp;
 
         gdm_wm_init (0);
         gdm_wm_focus_new_windows (TRUE);
     
+	tmp = ve_filename_to_utf8 (g_getenv ("GDM_THEME"));
 	s = g_strdup_printf (_("There was an error loading the "
-			       "theme %s"),
-			     g_getenv ("GDM_THEME"));
+			       "theme %s"), tmp);
+	g_free (tmp);
         dialog = ve_hig_dialog_new (NULL /* parent */,
 				    GTK_DIALOG_MODAL /* flags */,
 				    GTK_MESSAGE_ERROR,
 				    GTK_BUTTONS_OK,
+				    FALSE /* markup */,
 				    s,
 				    "%s", (error && error->message) ? error->message : "");
 	g_free (s);
@@ -1294,6 +1304,7 @@ main (int argc, char *argv[])
 				  GTK_DIALOG_MODAL /* flags */,
 				  GTK_MESSAGE_ERROR,
 				  GTK_BUTTONS_OK,
+				  FALSE /* markup */,
 				  _("The theme for the graphical greeter "
 				    "is corrupt"),
 				  "%s",
@@ -1329,6 +1340,7 @@ main (int argc, char *argv[])
 				  GTK_DIALOG_MODAL /* flags */,
 				  GTK_MESSAGE_ERROR,
 				  GTK_BUTTONS_OK,
+				  FALSE /* markup */,
 				  _("There was an error loading the "
 				    "theme, and the default theme "
 				    "also could not have been loaded, "
@@ -1350,6 +1362,7 @@ main (int argc, char *argv[])
 				  GTK_DIALOG_MODAL /* flags */,
 				  GTK_MESSAGE_ERROR,
 				  GTK_BUTTONS_OK,
+				  FALSE /* markup */,
 				  _("I could not start the standard "
 				    "greeter.  This display will abort "
 				    "and you may have to login another "
@@ -1398,6 +1411,7 @@ main (int argc, char *argv[])
 				  GTK_DIALOG_MODAL /* flags */,
 				  GTK_MESSAGE_ERROR,
 				  GTK_BUTTONS_OK,
+				  FALSE /* markup */,
 				  _("Session directory is missing"),
 				  "%s",
 				  _("Your session directory is missing or empty!  "
@@ -1424,6 +1438,7 @@ main (int argc, char *argv[])
 				  GTK_DIALOG_MODAL /* flags */,
 				  GTK_MESSAGE_ERROR,
 				  GTK_BUTTONS_OK,
+				  FALSE /* markup */,
 				  _("Configuration is not correct"),
 				  "%s",
 				  _("The configuration file contains an invalid command "
@@ -1452,6 +1467,7 @@ main (int argc, char *argv[])
 				  GTK_DIALOG_MODAL /* flags */,
 				  GTK_MESSAGE_ERROR,
 				  GTK_BUTTONS_OK,
+				  FALSE /* markup */,
 				  _("No configuration was found"),
 				  "%s",
 				  _("The configuration was not found.  GDM is using "
diff --git a/gui/greeter/greeter.h b/gui/greeter/greeter.h
index fa9858e5..270db69d 100644
--- a/gui/greeter/greeter.h
+++ b/gui/greeter/greeter.h
@@ -10,7 +10,7 @@ extern GtkWidget *window;
 extern gboolean greeter_probably_login_prompt;
 
 void     greeter_abort   (const gchar *format, ...);
-gboolean greeter_query   (const gchar *msg, const char *posbutton, const char *negbutton);
+gboolean greeter_query   (const gchar *msg, gboolean markup, const char *posbutton, const char *negbutton);
 void     greeter_message (const gchar *msg);
 
 void     greeter_setup_cursor (GdkCursorType type);
diff --git a/gui/greeter/greeter_action_language.c b/gui/greeter/greeter_action_language.c
index 60ddcf0e..bdbe2ead 100644
--- a/gui/greeter/greeter_action_language.c
+++ b/gui/greeter/greeter_action_language.c
@@ -151,7 +151,7 @@ greeter_language_get_language (const char *old_language)
 	  g_free (current_name);
 	  g_free (saved_name);
 
-	  savelang = greeter_query (msg, _("Make _Default"), _("Just For _This Session"));
+	  savelang = greeter_query (msg, TRUE /* markup */, _("Make _Default"), _("Just For _This Session"));
 	  g_free (msg);
 	}
     }
diff --git a/gui/greeter/greeter_item_pam.c b/gui/greeter/greeter_item_pam.c
index dcdf983c..f6064c6b 100644
--- a/gui/greeter/greeter_item_pam.c
+++ b/gui/greeter/greeter_item_pam.c
@@ -385,6 +385,7 @@ greeter_item_pam_leftover_messages (void)
 				   GTK_DIALOG_MODAL /* flags */,
 				   GTK_MESSAGE_INFO,
 				   GTK_BUTTONS_OK,
+				   FALSE /* markup */,
 				   oldtext,
 				   /* avoid warning */ "%s", "");
 	  gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE);
diff --git a/gui/greeter/greeter_session.c b/gui/greeter/greeter_session.c
index 1ef526ae..a7990350 100644
--- a/gui/greeter/greeter_session.c
+++ b/gui/greeter/greeter_session.c
@@ -126,7 +126,7 @@ greeter_session_lookup (const char *saved_session)
 				   "future sessions?"),
 				 session_name (saved_session),
 				 session_name (default_session));	    
-	  save_session = greeter_query (msg, _("Make _Default"), _("Just _Log In"));
+	  save_session = greeter_query (msg, FALSE /* markup */, _("Make _Default"), _("Just _Log In"));
 	  g_free (msg);
 	}
     }
@@ -156,7 +156,7 @@ greeter_session_lookup (const char *saved_session)
 				     session_name (session),
 				     session_name (saved_session),
 				     session_name (session));
-	      save_session = greeter_query (msg, _("Make _Default"), _("Just For _This Session"));
+	      save_session = greeter_query (msg, FALSE /* markup */, _("Make _Default"), _("Just For _This Session"));
 	    }
 	  else if (strcmp (session, "Xclients.desktop") != 0 &&
 		   strcmp (session, LAST_SESSION) != 0)
diff --git a/gui/greeter/greeter_system.c b/gui/greeter/greeter_system.c
index 53926c92..e0694537 100644
--- a/gui/greeter/greeter_system.c
+++ b/gui/greeter/greeter_system.c
@@ -53,6 +53,7 @@ static void
 query_greeter_reboot_handler (void)
 {
 	if (greeter_query (_("Are you sure you want to reboot the machine?"),
+			   FALSE /* markup */,
 			   _("_Reboot"), GTK_STOCK_CANCEL)) {
 		closelog();
 		
@@ -65,6 +66,7 @@ static void
 query_greeter_halt_handler (void)
 {
 	if (greeter_query (_("Are you sure you want to shut down the machine?"),
+			   FALSE /* markup */,
 			   _("Shut_down"), GTK_STOCK_CANCEL)) {
 		closelog();
 
@@ -76,6 +78,7 @@ static void
 query_greeter_suspend_handler (void)
 {
 	if (greeter_query (_("Are you sure you want to suspend the machine?"),
+			   FALSE /* markup */,
 			   _("_Suspend"), GTK_STOCK_CANCEL)) {
 		/* suspend interruption */
 		printf ("%c%c%c\n", STX, BEL, GDM_INTERRUPT_SUSPEND);