GNOME HIG fixes for the Language, Session and Message dialogs. Modified

2005-08-20  Dennis Cranston  <dennis_cranston@yahoo.com>

        * gui/gdmXnestchooser.c: (main):
        * gui/gdmchooser.c: (gdm_chooser_decode_packet), (add_check),
          (gdm_chooser_add_host), (main):
        * gui/gdmcomm.c: (gdmcomm_check):
        * gui/gdmcommon.h:
        * gui/gdmflexiserver.c: (change_vt), (main):
        * gui/gdmlogin.c: (back_prog_run), (gdm_login_restart_handler),
          (gdm_login_halt_handler), (gdm_login_suspend_handler),
          (gdm_login_session_lookup), (gdm_login_language_lookup),
          (gdm_login_ctrl_handler), (main):
        * gui/gdmphotosetup.c: (set_face_from_filename):
        * gui/gdmsetup.c: (update_greeters), (root_not_allowed),
          (theme_install_response), (delete_theme), (main):
        * gui/gdmwm.c: (gdm_common_message), (gdm_common_query),
          (gdm_common_warn):
        * gui/greeter/greeter.c: (greeter_ctrl_handler),
          (verify_gdm_version), (main):
        * gui/greeter/greeter_action_language.c:
          (greeter_langauge_initialize_model),
          (greeter_language_get_language), (greeter_action_language):
        * gui/greeter/greeter_item_pam.c:
          (greeter_item_pam_leftover_messages):
        * gui/greeter/greeter_session.c: (greeter_session_lookup),
          (greeter_session_init):
        * gui/greeter/greeter_system.c: (query_greeter_restart_handler),
          (query_greeter_halt_handler), (query_greeter_suspend_handler):
        * vicious-extensions/glade-helper.c: (glade_helper_bad_interface),
          (glade_helper_bad_columns), (glade_helper_no_interface):
        * vicious-extensions/ve-miscui.c: (ve_hig_dialog_new):
        * vicious-extensions/ve-miscui.h:

        GNOME HIG fixes for the Language, Session and Message dialogs.
        Modified the ve_hig_dialog_new() function to use
        gtk_message_dialog_new() now that it supports both primary and
        secondary text.  Changed the shutdown, reboot, and suspend
        dialogs to type GTK_MESSAGE_WARNING.

1 files changed, 6 insertions, 3 deletions

diff --git a/gui/gdmphotosetup.c b/gui/gdmphotosetup.c
index 5df0bbaa..edc37c13 100644
--- a/gui/gdmphotosetup.c
+++ b/gui/gdmphotosetup.c
@@ -159,20 +159,23 @@ set_face_from_filename (const char *filename)
 	if (gdk_pixbuf_save (pixbuf, photofile, "png", NULL, NULL) != TRUE) {
 		GtkWidget *d;
 		char	  *tmp = g_filename_to_utf8 (photofile, -1, NULL, NULL, NULL);
+		char      *msg;
+		
+		msg = g_strdup_printf (_("File %s cannot be opened for "
+					 "writing."), tmp);
 
 		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 opened for "
-					 "writing\n"), tmp);
+				       msg);
 
 		gtk_dialog_run (GTK_DIALOG (d));
 		gtk_widget_destroy (d);
 
 		g_free (tmp);
+		g_free (msg);
 	} else {
 		/* Change to g_chmod after glib 2.8 release */
 		chmod (photofile, 0644);