[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kmail-devel
Subject:    [PATCH] Use folder identity when composing from kontact/dcop
From:       Paul Sprakes <paul () sprakes ! co ! uk>
Date:       2005-04-08 11:14:47
Message-ID: 200504081214.47603.paul () sprakes ! co ! uk
[Download RAW message or body]

Currently, the folder identity is not used when composing a new mail from 
Kontact. The attached patch fixes that. 

There are a few bug reports about this but they all seem to be fixed?

Is it OK to commit?



Thanks, Paul.

["kmail-kontact_folder-ident.patch" (text/x-diff)]

Index: kmail/kmkernel.cpp
===================================================================
RCS file: /home/kde/kdepim/kmail/kmkernel.cpp,v
retrieving revision 1.331
diff -U3 -r1.331 kmkernel.cpp
--- kmail/kmkernel.cpp	5 Apr 2005 18:15:03 -0000	1.331
+++ kmail/kmkernel.cpp	8 Apr 2005 10:57:29 -0000
@@ -362,8 +362,17 @@
 {
   kdDebug(5006) << "KMKernel::openComposer called" << endl;
 
+  KMMainWidget *widget = getKMMainWidget();
+  KMFolder *folder = 0;
+  if ( widget && widget->folderTree() ) {
+	  folder = widget->folderTree()->currentFolder();
+  }
   KMMessage *msg = new KMMessage;
-  msg->initHeader();
+  if(folder) {
+	  msg->initHeader(folder->identity());
+  } else {
+	  msg->initHeader();
+  }
   msg->setCharset("utf-8");
   if (!cc.isEmpty()) msg->setCc(cc);
   if (!bcc.isEmpty()) msg->setBcc(bcc);
@@ -428,10 +437,20 @@
                             const QCString &attachCharset )
 {
   kdDebug(5006) << "KMKernel::openComposer()" << endl;
-
+  KMFolder *folder = 0;
   KMMessage *msg = new KMMessage;
   KMMessagePart *msgPart = 0;
-  msg->initHeader();
+  //see if we can get folder details so we can set the correct identity in new messages
+  KMMainWidget *widget = getKMMainWidget();
+  if ( widget && widget->folderTree() ) {
+    folder = widget->folderTree()->currentFolder();
+  }
+
+  if(folder) {
+    msg->initHeader(folder->identity());
+  } else {
+    msg->initHeader();
+  }
   msg->setCharset( "utf-8" );
   if ( !cc.isEmpty() ) msg->setCc(cc);
   if ( !bcc.isEmpty() ) msg->setBcc(bcc);
@@ -515,7 +534,18 @@
                                const QString &body,bool hidden)
 {
   KMMessage *msg = new KMMessage;
-  msg->initHeader();
+  KMMainWidget *widget = getKMMainWidget();
+  KMFolder *folder = 0;
+  if ( widget && widget->folderTree() ) {
+	  folder = widget->folderTree()->currentFolder();
+  }
+
+  if(folder) {
+	  msg->initHeader(folder->identity());
+  } else {
+	  msg->initHeader();
+  }
+
   msg->setCharset("utf-8");
   if (!cc.isEmpty()) msg->setCc(cc);
   if (!bcc.isEmpty()) msg->setBcc(bcc);


_______________________________________________
KMail developers mailing list
KMail-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmail-devel


[prev in list] [next in list] [prev in thread] [next in thread]