aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2005-04-01 08:43:35 +0800
committerMichael Zucci <zucchi@src.gnome.org>2005-04-01 08:43:35 +0800
commit13c09af92ab2a5cbdbf6053ecd3d0fd1b28c98eb (patch)
tree9b12d098bc0a8088a6a34860c8f63ea7dd6f57c8
parent94513cd4bed10979f56df454b584a404440b6c04 (diff)
downloadgsoc2013-evolution-13c09af92ab2a5cbdbf6053ecd3d0fd1b28c98eb.tar
gsoc2013-evolution-13c09af92ab2a5cbdbf6053ecd3d0fd1b28c98eb.tar.gz
gsoc2013-evolution-13c09af92ab2a5cbdbf6053ecd3d0fd1b28c98eb.tar.bz2
gsoc2013-evolution-13c09af92ab2a5cbdbf6053ecd3d0fd1b28c98eb.tar.lz
gsoc2013-evolution-13c09af92ab2a5cbdbf6053ecd3d0fd1b28c98eb.tar.xz
gsoc2013-evolution-13c09af92ab2a5cbdbf6053ecd3d0fd1b28c98eb.tar.zst
gsoc2013-evolution-13c09af92ab2a5cbdbf6053ecd3d0fd1b28c98eb.zip
** See bug #72518
2005-03-31 Not Zed <NotZed@Ximian.com> ** See bug #72518 * em-folder-tree.c (emft_popup_delete_folder): prompt for vfolder case differently. svn path=/trunk/; revision=29143
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-folder-tree.c5
-rw-r--r--mail/mail-errors.xml7
-rw-r--r--mail/mail-errors.xml.h4
4 files changed, 21 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 12bea76cf7..a38bd74ec7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
2005-03-31 Not Zed <NotZed@Ximian.com>
+ ** See bug #72518
+
+ * em-folder-tree.c (emft_popup_delete_folder): prompt for vfolder
+ case differently.
+
+2005-03-31 Not Zed <NotZed@Ximian.com>
+
* message-list.c (on_selection_changed_cmd): only noop if we only
have 1 message selected, otherwise we don't update the menu's.
Fixes a problem introduced by 64987's fix.
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 7604dba0a9..a663022298 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2669,9 +2669,10 @@ emft_popup_delete_folder (EPopup *ep, EPopupItem *pitem, void *data)
}
camel_object_ref (store);
-
+
dialog = e_error_new((GtkWindow *)gtk_widget_get_toplevel((GtkWidget *)emft),
- "mail:ask-delete-folder", full_name, NULL);
+ (store && CAMEL_IS_VEE_STORE(store))?"mail:ask-delete-vfolder":"mail:ask-delete-folder",
+ full_name, NULL);
g_object_set_data_full ((GObject *) dialog, "full_name", full_name, g_free);
g_object_set_data_full ((GObject *) dialog, "store", store, camel_object_unref);
g_signal_connect (dialog, "response", G_CALLBACK (emft_popup_delete_response), emft);
diff --git a/mail/mail-errors.xml b/mail/mail-errors.xml
index 045cf9326a..c19cdf5fce 100644
--- a/mail/mail-errors.xml
+++ b/mail/mail-errors.xml
@@ -189,6 +189,13 @@ The message is stored in the Outbox folder. Check the message for errors and re
<button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
</error>
+ <error id="ask-delete-vfolder" type="question" default="GTK_RESPONSE_CANCEL">
+ <title>Delete &quot;{0}&quot;?</title>
+ <primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</primary>
+ <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
+ </error>
+
<error id="no-rename-folder-exists" type="error">
<primary>Cannot rename &quot;{0}&quot; to &quot;{1}&quot;.</primary>
<secondary>A folder named &quot;{1}&quot; already exists. Please use a different name.</secondary>
diff --git a/mail/mail-errors.xml.h b/mail/mail-errors.xml.h
index ba728c520d..7161251dea 100644
--- a/mail/mail-errors.xml.h
+++ b/mail/mail-errors.xml.h
@@ -129,6 +129,10 @@ char *s = N_("Delete \"{0}\"?");
char *s = N_("Really delete folder \"{0}\" and all of its subfolders?");
/* mail:ask-delete-folder secondary */
char *s = N_("If you delete the folder, all of its contents and its subfolders contents will be deleted permanently.");
+/* mail:ask-delete-vfolder title */
+char *s = N_("Delete \"{0}\"?");
+/* mail:ask-delete-vfolder primary */
+char *s = N_("Really delete folder \"{0}\" and all of its subfolders?");
/* mail:no-rename-folder-exists primary */
char *s = N_("Cannot rename \"{0}\" to \"{1}\".");
/* mail:no-rename-folder-exists secondary */