fix markup being ignored when a window title has a forbidden character in

2003-08-08  Bastien Nocera  <hadess@hadess.net>

	* src/metacity-dialog.c: (kill_window_question),
	(warn_about_no_sm_support): fix markup being ignored when a window
	title has a forbidden character in it (eg. "Send & Receive")
	* src/tools/metacity-window-demo.c: fix warning
This commit is contained in:
Bastien Nocera 2003-08-08 16:25:34 +00:00 committed by Bastien Nocera
parent 435bf3f2e4
commit a252050cb8
3 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,10 @@
2003-08-08 Bastien Nocera <hadess@hadess.net>
* src/metacity-dialog.c: (kill_window_question),
(warn_about_no_sm_support): fix markup being ignored when a window
title has a forbidden character in it (eg. "Send & Receive")
* src/tools/metacity-window-demo.c: fix warning
2003-07-29 Arvind Samptur <arvind.samptur@wipro.com> 2003-07-29 Arvind Samptur <arvind.samptur@wipro.com>
* src/xprops.c (utf8_list_from_results): Number of * src/xprops.c (utf8_list_from_results): Number of

View File

@ -81,9 +81,10 @@ kill_window_question (const char *window_name,
GtkWidget *dialog; GtkWidget *dialog;
char *str, *tmp; char *str, *tmp;
str = g_strdup_printf (_("The window \"%s\" is not responding."), tmp = g_markup_escape_text (window_name, -1);
window_name); str = g_strdup_printf (_("The window \"%s\" is not responding."), tmp);
g_free (tmp);
dialog = gtk_message_dialog_new (NULL, 0, dialog = gtk_message_dialog_new (NULL, 0,
GTK_MESSAGE_WARNING, GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE, GTK_BUTTONS_NONE,
@ -239,7 +240,7 @@ warn_about_no_sm_support (char **lame_apps)
/* Wait 4 minutes then force quit, so we don't wait around all night */ /* Wait 4 minutes then force quit, so we don't wait around all night */
g_timeout_add (4 * 60 * 1000, (GSourceFunc) gtk_main_quit, NULL); g_timeout_add (4 * 60 * 1000, (GSourceFunc) gtk_main_quit, NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
list = create_lame_apps_list (lame_apps); list = create_lame_apps_list (lame_apps);
sw = gtk_scrolled_window_new (NULL, NULL); sw = gtk_scrolled_window_new (NULL, NULL);

View File

@ -704,6 +704,7 @@ sleep_cb (GtkWidget *button,
sleep (1000); sleep (1000);
} }
static void
toggle_aspect_ratio (GtkWidget *button, toggle_aspect_ratio (GtkWidget *button,
gpointer data) gpointer data)
{ {