From 616976af1e14d0aeb6a605ba08319e8375cc0705 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 11 Nov 2007 10:39:24 +0000 Subject: [PATCH] 2007-11-11 [colin] 3.0.2cvs133 * src/imap_gtk.c * src/mh_gtk.c Use markup-escaped strings in dialogs --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/imap_gtk.c | 6 +++--- src/mh_gtk.c | 4 ++-- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0097535e2..3989d272c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-11 [colin] 3.0.2cvs133 + + * src/imap_gtk.c + * src/mh_gtk.c + Use markup-escaped strings in dialogs + 2007-11-11 [colin] 3.0.2cvs132 * src/imap.c diff --git a/PATCHSETS b/PATCHSETS index 00fee23be..625788472 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3045,3 +3045,4 @@ ( cvs diff -u -r 1.654.2.3099 -r 1.654.2.3100 configure.ac; cvs diff -u -r 1.149.2.84 -r 1.149.2.85 src/inc.c; cvs diff -u -r 1.115.2.174 -r 1.115.2.175 src/main.c; cvs diff -u -r 1.7.2.14 -r 1.7.2.15 src/main.h; cvs diff -u -r 1.83.2.122 -r 1.83.2.123 src/mimeview.c; cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/statusbar.c; cvs diff -u -r 1.36.2.122 -r 1.36.2.123 src/common/utils.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/etpan/Makefile.am; cvs diff -u -r 1.2.2.35 -r 1.2.2.36 src/gtk/filesel.c; cvs diff -u -r 1.4.2.39 -r 1.4.2.40 src/gtk/gtkutils.h; cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/gtk/menu.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/bogofilter/Makefile.am; cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/plugins/clamav/Makefile.am; cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/plugins/dillo_viewer/Makefile.am; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpcore/Makefile.am; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/plugins/spamassassin/Makefile.am; cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/plugins/trayicon/Makefile.am; ) > 3.0.2cvs130.patchset ( cvs diff -u -r 1.101.2.44 -r 1.101.2.45 src/news.c; ) > 3.0.2cvs131.patchset ( cvs diff -u -r 1.179.2.197 -r 1.179.2.198 src/imap.c; ) > 3.0.2cvs132.patchset +( cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/imap_gtk.c; cvs diff -u -r 1.2.2.28 -r 1.2.2.29 src/mh_gtk.c; ) > 3.0.2cvs133.patchset diff --git a/configure.ac b/configure.ac index 98ba995e4..9617fc5e0 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=132 +EXTRA_VERSION=133 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/imap_gtk.c b/src/imap_gtk.c index c080ff7bb..36e9c0293 100644 --- a/src/imap_gtk.c +++ b/src/imap_gtk.c @@ -295,7 +295,7 @@ static void delete_folder_cb(FolderView *folderview, guint action, name = trim_string(item->name, 32); AUTORELEASE_STR(name, {g_free(name); return;}); - message = g_strdup_printf + message = g_markup_printf_escaped (_("All folders and messages under '%s' will be permanently deleted. " "Recovery will not be possible.\n\n" "Do you really want to delete?"), name); @@ -443,7 +443,7 @@ static void subscribe_cb(FolderView *folderview, guint action, if (action && item->folder->account->imap_subsonly) { GList *child_list = NULL; - message = g_strdup_printf + message = g_markup_printf_escaped (_("Do you want to search for unsubscribed subfolders of '%s'?"), name); @@ -488,7 +488,7 @@ static void subscribe_cb(FolderView *folderview, guint action, g_list_free(child_list); return; } - message = g_strdup_printf + message = g_markup_printf_escaped (_("Do you want to %s the '%s' folder?"), action?_("subscribe"):_("unsubscribe"), name); diff --git a/src/mh_gtk.c b/src/mh_gtk.c index 98457eb79..6081a7b74 100644 --- a/src/mh_gtk.c +++ b/src/mh_gtk.c @@ -175,7 +175,7 @@ static void delete_folder_cb(FolderView *folderview, guint action, name = trim_string(item->name, 32); AUTORELEASE_STR(name, {g_free(name); return;}); - message = g_strdup_printf + message = g_markup_printf_escaped (_("All folders and messages under '%s' will be permanently deleted. " "Recovery will not be possible.\n\n" "Do you really want to delete?"), name); @@ -320,7 +320,7 @@ static void remove_mailbox_cb(FolderView *folderview, guint action, if (folder_item_parent(item)) return; name = trim_string(item->folder->name, 32); - message = g_strdup_printf + message = g_markup_printf_escaped (_("Really remove the mailbox '%s' ?\n" "(The messages are NOT deleted from the disk)"), name); avalue = alertpanel_full(_("Remove mailbox"), message, -- 2.25.1