Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/totem/ChangeLog,v
retrieving revision 1.1105
diff -p -u -r1.1105 ChangeLog
--- ChangeLog	11 Jan 2005 00:02:26 -0000	1.1105
+++ ChangeLog	11 Jan 2005 04:44:07 -0000
@@ -1,0 +1,10 @@
+2005-01-10  William Jon McCann  <mccann@jhu.edu>
+
+	* src/vanity.c (vanity_action_error): 
+	* src/totem.c (totem_action_error, totem_action_error_and_exit): 
+	* src/totem-screenshot.c (totem_screenshot_action_error): 
+	* src/totem-preferences.c (ask_show_visuals): 
+	* src/totem-playlist.c (totem_playlist_error) 
+	(totem_playlist_save_files):
+	Use GTK 2.5 HIG message dialog API.
+
Index: src/totem-playlist.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem-playlist.c,v
retrieving revision 1.60
diff -p -u -r1.60 totem-playlist.c
--- src/totem-playlist.c	10 Jan 2005 18:53:58 -0000	1.60
+++ src/totem-playlist.c	11 Jan 2005 04:44:09 -0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* gtk-playlist.c
 
    Copyright (C) 2002, 2003 Bastien Nocera
@@ -165,23 +166,19 @@ static void
 totem_playlist_error (char *title, char *reason, TotemPlaylist *playlist)
 {
 	GtkWidget *error_dialog;
-	char *title_esc, *reason_esc;
-
-	title_esc = g_markup_escape_text (title, -1);
-	reason_esc = g_markup_escape_text (reason, -1);
 
 	error_dialog =
 		gtk_message_dialog_new (GTK_WINDOW (playlist),
 				GTK_DIALOG_MODAL,
 				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK,
-				"<b>%s</b>\n%s.", title_esc, reason_esc);
-	g_free (title_esc);
-	g_free (reason_esc);
+				title);
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error_dialog),
+						  reason);
+
 	gtk_container_set_border_width (GTK_CONTAINER (error_dialog), 5);
 	gtk_dialog_set_default_response (GTK_DIALOG (error_dialog),
 			GTK_RESPONSE_OK);
-	gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (error_dialog)->label), TRUE);
 	g_signal_connect (G_OBJECT (error_dialog), "destroy", G_CALLBACK
 			(gtk_widget_destroy), error_dialog);
 	g_signal_connect (G_OBJECT (error_dialog), "response", G_CALLBACK
@@ -851,8 +848,11 @@ totem_playlist_save_files (GtkWidget *wi
 				 GTK_DIALOG_MODAL,
 				 GTK_MESSAGE_QUESTION,
 				 GTK_BUTTONS_NONE,
-				 _("A file named '%s' already exists.\nAre you sure you want to overwrite it?"),
-				 filename);
+				 _("Overwrite file?"));
+			gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+								  _("A file named '%s' already exists.  Are you sure you want to overwrite it?"),
+								  filename);
+
 			gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
 			gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 					GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
Index: src/totem-preferences.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem-preferences.c,v
retrieving revision 1.46
diff -p -u -r1.46 totem-preferences.c
--- src/totem-preferences.c	6 Jan 2005 17:35:14 -0000	1.46
+++ src/totem-preferences.c	11 Jan 2005 04:44:10 -0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* 
  * Copyright (C) 2001,2002,2003 Bastien Nocera <hadess@hadess.net>
  *
@@ -74,9 +75,11 @@ ask_show_visuals (Totem *totem)
 				GTK_DIALOG_MODAL,
 				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_YES_NO,
-				_("It seems you are running Totem remotely.\n"
-				"Are you sure you want to enable the visual "
-				"effects?"));
+				_("Enable visual effects?"));
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+						  _("It seems you are running Totem remotely.\n"
+						    "Are you sure you want to enable the visual "
+						    "effects?"));
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog),
 			GTK_RESPONSE_NO);
Index: src/totem-screenshot.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem-screenshot.c,v
retrieving revision 1.7
diff -p -u -r1.7 totem-screenshot.c
--- src/totem-screenshot.c	19 Nov 2004 00:53:27 -0000	1.7
+++ src/totem-screenshot.c	11 Jan 2005 04:44:10 -0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* totem-screenshot.c
 
    Copyright (C) 2004 Bastien Nocera
@@ -63,24 +64,18 @@ totem_screenshot_action_error (char *tit
 		TotemScreenshot *screenshot)
 {
 	GtkWidget *error_dialog;
-	char *title_esc, *reason_esc;
-
-	title_esc = g_markup_escape_text (title, -1);
-	reason_esc = g_markup_escape_text (reason, -1);
 
 	error_dialog =
 		gtk_message_dialog_new (GTK_WINDOW (screenshot),
 				GTK_DIALOG_MODAL,
 				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK,
-				"<b>%s</b>\n%s.", title_esc, reason_esc);
-	g_free (title_esc);
-	g_free (reason_esc);
+				title);
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error_dialog), reason);
 
 	gtk_container_set_border_width (GTK_CONTAINER (error_dialog), 5);
 	gtk_dialog_set_default_response (GTK_DIALOG (error_dialog),
 			GTK_RESPONSE_OK);
-	gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (error_dialog)->label), TRUE);
 	g_signal_connect (G_OBJECT (error_dialog), "destroy", G_CALLBACK
 			(gtk_widget_destroy), error_dialog);
 	g_signal_connect (G_OBJECT (error_dialog), "response", G_CALLBACK
Index: src/totem.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem.c,v
retrieving revision 1.399
diff -p -u -r1.399 totem.c
--- src/totem.c	10 Jan 2005 18:53:58 -0000	1.399
+++ src/totem.c	11 Jan 2005 04:44:14 -0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* 
  * Copyright (C) 2001-2004 Bastien Nocera <hadess@hadess.net>
  *
@@ -112,7 +113,6 @@ void
 totem_action_error (char *title, char *reason, Totem *totem)
 {
 	GtkWidget *parent, *error_dialog;
-	char *title_esc, *reason_esc;
 
 	if (reason == NULL)
 		g_warning ("totem_action_error called with reason == NULL");
@@ -122,22 +122,18 @@ totem_action_error (char *title, char *r
 	else
 		parent = totem->win;
 
-	title_esc = g_markup_escape_text (title, -1);
-	reason_esc = g_markup_escape_text (reason, -1);
-
 	error_dialog =
 		gtk_message_dialog_new (GTK_WINDOW (parent),
 				GTK_DIALOG_MODAL,
 				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK,
-				"<b>%s</b>\n%s", title_esc, reason_esc);
-	g_free (title_esc);
-	g_free (reason_esc);
+				title);
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error_dialog),
+						  reason);
 
 	gtk_container_set_border_width (GTK_CONTAINER (error_dialog), 5);
 	gtk_dialog_set_default_response (GTK_DIALOG (error_dialog),
 			GTK_RESPONSE_OK);
-	gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (error_dialog)->label), TRUE);
 	g_signal_connect (G_OBJECT (error_dialog), "destroy", G_CALLBACK
 			(gtk_widget_destroy), error_dialog);
 	g_signal_connect (G_OBJECT (error_dialog), "response", G_CALLBACK
@@ -157,9 +153,10 @@ totem_action_error_and_exit (char *title
 				GTK_DIALOG_MODAL,
 				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK,
-				"<b>%s</b>\n%s", title, reason);
+				title);
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error_dialog),
+						  reason);
 	gtk_container_set_border_width (GTK_CONTAINER (error_dialog), 5);
-	gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (error_dialog)->label), TRUE);
 	gtk_dialog_set_default_response (GTK_DIALOG (error_dialog),
 			GTK_RESPONSE_OK);
 	gtk_window_set_modal (GTK_WINDOW (error_dialog), TRUE);
Index: src/vanity.c
===================================================================
RCS file: /cvs/gnome/totem/src/vanity.c,v
retrieving revision 1.19
diff -p -u -r1.19 vanity.c
--- src/vanity.c	8 Jan 2005 20:31:35 -0000	1.19
+++ src/vanity.c	11 Jan 2005 04:44:14 -0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* 
  * Copyright (C) 2001,2002,2003 Bastien Nocera <hadess@hadess.net>
  *
@@ -78,29 +79,23 @@ static void
 vanity_action_error (char *title, char *reason, Vanity *vanity)
 {
 	GtkWidget *parent, *error_dialog;
-	char *title_esc, *reason_esc;
 
 	if (vanity == NULL)
 		parent = NULL;
 	else
 		parent = vanity->win;
 
-	title_esc = g_markup_escape_text (title, -1);
-	reason_esc = g_markup_escape_text (reason, -1);
-
 	error_dialog =
 		gtk_message_dialog_new (GTK_WINDOW (parent),
 				GTK_DIALOG_MODAL,
 				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK,
-				"<b>%s</b>\n%s.", title_esc, reason_esc);
-	g_free (title_esc);
-	g_free (reason_esc);
+				title);
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error_dialog), reason);
 
 	gtk_container_set_border_width (GTK_CONTAINER (error_dialog), 5);
 	gtk_dialog_set_default_response (GTK_DIALOG (error_dialog),
 			GTK_RESPONSE_OK);
-	gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (error_dialog)->label), TRUE);
 	g_signal_connect (G_OBJECT (error_dialog), "destroy", G_CALLBACK
 			(gtk_widget_destroy), error_dialog);
 	g_signal_connect (G_OBJECT (error_dialog), "response", G_CALLBACK
