[evolution-patches] 72518, 'messages will be deleted' for vfolder deletion

[Not Zed <notzed ximian com>]

doesn't change strings afterall, so could go into stable branch




Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3611
diff -u -p -r1.3611 ChangeLog
--- mail/ChangeLog	30 Mar 2005 07:57:45 -0000	1.3611
+++ mail/ChangeLog	31 Mar 2005 03:33:47 -0000
@@ -1,3 +1,10 @@
+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-30  Li Yuan  <li yuan sun com>
 
 	* em-account-prefs.c: (em_account_prefs_treeview_new):
Index: mail/em-folder-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
retrieving revision 1.145
diff -u -p -r1.145 em-folder-tree.c
--- mail/em-folder-tree.c	10 Mar 2005 13:51:48 -0000	1.145
+++ mail/em-folder-tree.c	31 Mar 2005 03:33:48 -0000
@@ -2669,9 +2669,10 @@ emft_popup_delete_folder (EPopup *ep, EP
 	}
 	
 	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);
Index: mail/mail-errors.xml
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-errors.xml,v
retrieving revision 1.12
diff -u -p -r1.12 mail-errors.xml
--- mail/mail-errors.xml	1 Feb 2005 19:30:49 -0000	1.12
+++ mail/mail-errors.xml	31 Mar 2005 03:33:49 -0000
@@ -189,6 +189,13 @@ The message is stored in the Outbox fold
   <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>
Index: mail/mail-errors.xml.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-errors.xml.h,v
retrieving revision 1.12
diff -u -p -r1.12 mail-errors.xml.h
--- mail/mail-errors.xml.h	1 Feb 2005 19:30:49 -0000	1.12
+++ mail/mail-errors.xml.h	31 Mar 2005 03:33:49 -0000
@@ -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 */