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

List:       kde-commits
Subject:    playground/pim/qma/src
From:       Tom Albers <tomalbers () kde ! nl>
Date:       2006-10-23 14:35:11
Message-ID: 1161614111.008679.5070.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 598417 by toma:

Fix bug where the company would make a mess of the emailaddress where it should go \
to. So don't include the company name in the address used in the composer.


 M  +3 -2      qmamessage.cpp  
 M  +2 -1      qmamessage.h  
 M  +1 -1      qmamessageview.cpp  
 M  +2 -2      qmawidget.cpp  


--- trunk/playground/pim/qma/src/qmamessage.cpp #598416:598417
@@ -147,9 +147,10 @@
     m->parse();
 
     m_sender_full = m->from()->asUnicodeString();
+
     KMime::Headers::Base *organization_raw= m->organization();
-    if (organization_raw && !organization_raw->asUnicodeString().isEmpty())
-        m_sender_full += " (" + organization_raw->asUnicodeString() + ")";
+    if (organization_raw)
+        m_company = organization_raw->asUnicodeString();
 
     KMime::Headers::To *to_raw= m->to();
     if (to_raw)
--- trunk/playground/pim/qma/src/qmamessage.h #598416:598417
@@ -60,7 +60,7 @@
     //TODO: const...
     QString subject()      { return m_subject;  }
     QString sender()       { return m_sender;   }
-    QString sender_full()  { return m_sender_full;   }
+    QString sender_full(bool i)  { return i && !m_company.isEmpty() ? \
m_sender_full+"("+m_company+")" : m_sender_full;   }  QString to()           { return \
m_to;   }  QStrList* to_list()    { return m_to_addresses;   }
     QString cc()           { return m_cc;   }
@@ -86,6 +86,7 @@
     QString     m_subject;
     QString     m_sender;
     QString     m_sender_full;
+    QString     m_company;
     QString     m_cc;
     QStrList*   m_cc_addresses;
     QString     m_to;
--- trunk/playground/pim/qma/src/qmamessageview.cpp #598416:598417
@@ -141,7 +141,7 @@
 
 void QMAHeaderView::updateHeaders()
 {
-    m_sender->setText(m_currentMessage->sender_full());
+    m_sender->setText(m_currentMessage->sender_full(true /* include company */));
     if (m_currentMessage->userAgent().startsWith("qma"))
         m_sender->setPaletteForegroundColor(QColor(Qt::darkGreen));
     else
--- trunk/playground/pim/qma/src/qmawidget.cpp #598416:598417
@@ -1051,7 +1051,7 @@
     QMAMessage *msg = headerItem->msg();
 
     Composer* composer = new Composer(mbi->fullName());
-    composer->setRcpt(msg->sender_full(), Composer::To);
+    composer->setRcpt(msg->sender_full(false /* no company*/), Composer::To);
 
     QStrList* list = msg->to_list();
     QStrList::Iterator it=list->begin();
@@ -1094,7 +1094,7 @@
     QMAMessage *msg = headerItem->msg();
     composer->setSubject("Fwd: " + msg->subject());
     QString text = "\n\n"
-            + i18n("At %1, %2 wrote:\n"). arg(msg->vDate(), msg->sender_full())
+            + i18n("At %1, %2 wrote:\n"). arg(msg->vDate(), msg->sender_full( false \
/* no company */))  + quote(msg->body())
             + "\n";
     composer->setMsg(text);


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