rev 5368 - in branches/etch/packages/kdepim/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-01-18 20:17:52 +0100 (Thu, 18 Jan 2007)
New Revision: 5368

Added:
   branches/etch/packages/kdepim/debian/patches/27_dimap_warning.diff
Modified:
   branches/etch/packages/kdepim/debian/changelog
Log:
add warning to branch as well 


Modified: branches/etch/packages/kdepim/debian/changelog
===================================================================
--- branches/etch/packages/kdepim/debian/changelog	2007-01-18 17:59:15 UTC (rev 5367)
+++ branches/etch/packages/kdepim/debian/changelog	2007-01-18 19:17:52 UTC (rev 5368)
@@ -5,8 +5,13 @@
   * Add kmail.README explaining the correct way to use Disconnected IMAP and
     warning that incorrect usage can result in mail loss. (Closes: #321102)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Jan 2007 11:23:06 -0500
+  +++ Changes by Sune Vuorela:
 
+  * Add 27_dimap_warning.diff to explain the correct way to use dimap when 
+    creating a dimap account. (Also closes: #321102)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 18 Jan 2007 20:16:18 +0100
+
 kdepim (4:3.5.5.dfsg.1-5) unstable; urgency=high
 
   +++ Changes by Sune Vuorela:

Added: branches/etch/packages/kdepim/debian/patches/27_dimap_warning.diff
===================================================================
--- branches/etch/packages/kdepim/debian/patches/27_dimap_warning.diff	2007-01-18 17:59:15 UTC (rev 5367)
+++ branches/etch/packages/kdepim/debian/patches/27_dimap_warning.diff	2007-01-18 19:17:52 UTC (rev 5368)
@@ -0,0 +1,21 @@
+Index: kdepim/kmail/configuredialog.cpp
+===================================================================
+--- kdepim/kmail/configuredialog.cpp	(revision 623910)
++++ kdepim/kmail/configuredialog.cpp	(working copy)
+@@ -1200,6 +1200,16 @@
+       return;
+   }
+ 
++  if ( accountType == "cachedimap" )
++  {
++	KMessageBox::information(this, " WARNING:\n\n It is possible to lose your e-mail with a Disconnected IMAP account if you do not use it correctly.  The purposes of Disconnected IMAP are to minimize bandwidth usage, to allow the user to decide when the client communicates with the server, and to keep a local copy of all e-mails.\n\n When using Disconnected IMAP, all changes (such as writing new e-mails, deleting e-mails, and moving e-mails between folders or accounts) are only made on the client until the user synchronizes the client with the server by using the Check Mail command when there is a network connection available.\n\n These are the commands that affect client-server syncronization:\n F5 synchronizes the current folder.\n Ctrl+L (Check Mail) synchronizes all folders in all accounts.\n Refresh Local IMAP Cache discards all local changes in the current folder.\n\n If you make changes that affect more than one folder or account, you should usually use Ctrl+L to make sure all of your changes are committed to the mail server.  ",
++	NULL, "dimap-warning", 0
++
++
++	);
++
++  }
++
+   KMAccount *account
+     = kmkernel->acctMgr()->create( QString::fromLatin1( accountType ) );
+   if ( !account ) {