Branch 'kolab/integration/4.13.0' - 4 commits - accountwizard/ldap.h agents/mailfilteragent calendarsupport/org.freedesktop.Akonadi.CalendarSearchAgent.xml incidenceeditor-ng/individualmaildialog.h kmail/kmcommands.cpp korganizer/org.kde.Korganizer.Calendar.xml messagelist/core messagelist/widget.cpp

Christian Mollekopf mollekopf at kolabsys.com
Mon Dec 22 16:03:52 CET 2014


 accountwizard/ldap.h                                               |    2 
 agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml |    2 
 calendarsupport/org.freedesktop.Akonadi.CalendarSearchAgent.xml    |    1 
 incidenceeditor-ng/individualmaildialog.h                          |    2 
 kmail/kmcommands.cpp                                               |   10 ---
 korganizer/org.kde.Korganizer.Calendar.xml                         |    4 +
 messagelist/core/settings.kcfg                                     |    1 
 messagelist/widget.cpp                                             |   27 ++--------
 8 files changed, 16 insertions(+), 33 deletions(-)

New commits:
commit a6cb62d2e652b073a2c76fe5a318a84f82aed55d
Merge: caa4f47 932afe4
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Mon Dec 22 16:02:48 2014 +0100

    Merge remote-tracking branch 'kolab/dev/ubuntu_12.04' into kolab/integration/4.13.0



commit 932afe414ae871f8b9e9c353b384e725f2dc7b52
Author: Sandro Knauß <knauss at kolabsys.com>
Date:   Sat Dec 20 22:19:15 2014 +0100

    qt4.8: annotation namespace changed
    
    The annotation namespace changes woth newer qt versions:
    old:
    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QDate"/>
    new:
    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QDate"/>

diff --git a/agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml b/agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
index d7bc82e..f5f3463 100644
--- a/agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
+++ b/agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
@@ -20,11 +20,13 @@
       <arg name="FilterRequires" type="i" direction="in"/>
       <arg name="listFilters" type="as" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="const QList<qint64> &"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="const QList<qint64> &"/>
     </method>
     <method name="filterItems">
       <arg name="items" type="ax" direction="in"/>
       <arg name="filterSet" type="i" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="const QList<qint64> &"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="const QList<qint64> &"/>
     </method>
     <method name="reload"/>
     <method name="showFilterLogDialog">
diff --git a/calendarsupport/org.freedesktop.Akonadi.CalendarSearchAgent.xml b/calendarsupport/org.freedesktop.Akonadi.CalendarSearchAgent.xml
index 185e439..29b737d 100644
--- a/calendarsupport/org.freedesktop.Akonadi.CalendarSearchAgent.xml
+++ b/calendarsupport/org.freedesktop.Akonadi.CalendarSearchAgent.xml
@@ -4,6 +4,7 @@
     <method name="createSearch">
        <arg type="a{sv}" direction="out">
         <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
       </arg>
       <arg name="startDate" type="s" direction="in"/>
       <arg name="endDate" type="s" direction="in"/>
diff --git a/korganizer/org.kde.Korganizer.Calendar.xml b/korganizer/org.kde.Korganizer.Calendar.xml
index df7ccdd..9c9834f 100644
--- a/korganizer/org.kde.Korganizer.Calendar.xml
+++ b/korganizer/org.kde.Korganizer.Calendar.xml
@@ -7,6 +7,7 @@
     <method name="goDate">
       <arg name="date" type="(iii)" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QDate"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QDate"/>
     </method>
     <method name="goDate">
       <arg name="date" type="s" direction="in"/>
@@ -14,6 +15,7 @@
     <method name="showDate">
       <arg name="date" type="(iii)" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QDate"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QDate"/>
     </method>
     <method name="openEventEditor">
       <arg name="text" type="s" direction="in"/>
@@ -78,11 +80,13 @@
     <method name="openJournalEditor">
       <arg name="date" type="(iii)" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QDate"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QDate"/>
     </method>
     <method name="openJournalEditor">
       <arg name="text" type="s" direction="in"/>
       <arg name="date" type="(iii)" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QDate"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QDate"/>
     </method>
     <method name="openJournalEditor">
       <arg name="text" type="s" direction="in"/>


commit 3d38e1eda7f55fc9a623b488729cf183757c5778
Author: Sandro Knauß <knauss at kolabsys.com>
Date:   Sat Dec 20 22:17:54 2014 +0100

    gcc4.6: needs friend class declaration

diff --git a/accountwizard/ldap.h b/accountwizard/ldap.h
index fdfd223..e0bb7b8 100644
--- a/accountwizard/ldap.h
+++ b/accountwizard/ldap.h
@@ -61,7 +61,7 @@ class Ldap : public SetupObject
 
     KLDAP::LdapClientSearchConfig *m_clientSearchConfig;
   private:
-    friend LdapTest;
+    friend class LdapTest;
     QString securityString();
 
     QString m_user;
diff --git a/incidenceeditor-ng/individualmaildialog.h b/incidenceeditor-ng/individualmaildialog.h
index 55eb2d9..96b3503 100644
--- a/incidenceeditor-ng/individualmaildialog.h
+++ b/incidenceeditor-ng/individualmaildialog.h
@@ -34,7 +34,7 @@ namespace IncidenceEditorNG {
 class IndividualMailDialog : public KDialog
 {
     Q_OBJECT
-    friend TestIndividualMailDialog;
+    friend class TestIndividualMailDialog;
 public:
     enum Decisions {
         Update,         /**< send automatic mail to attendee */


commit caa4f47570de2500d497482face230db5aeb34bb
Author: Sandro Knauß <knauss at kolabsys.com>
Date:   Thu Dec 11 11:32:24 2014 +0100

    messagelist: show complete taglist in tag combobox
    
    Instead of using configfile to store tags to display simply show all
    tags. Otherwise we had to update the list, if we update the tags from
    the kolab resource.
    
    KOLAB: #4053

diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index f0146d8..85fbd6d 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -1273,16 +1273,6 @@ void KMSetTagCommand::setTags()
     connect( modifyJob, SIGNAL(result(KJob*)), this, SLOT(slotModifyItemDone(KJob*)) );
 
     if(!mCreatedTags.isEmpty()) {
-        KConfigGroup tag( KMKernel::self()->config(), "MessageListView" );
-        const QString oldTagList = tag.readEntry("TagSelected");
-        QStringList lst = oldTagList.split(QLatin1String(","));
-        Q_FOREACH( const Akonadi::Tag &tag, mCreatedTags ) {
-            const QString url = tag.url().url();
-            if(!lst.contains(url)) {
-                lst.append(url);
-            }
-        }
-        tag.writeEntry("TagSelected",lst);
         KMKernel::self()->updatePaneTagComboBox();
     }
 }
diff --git a/messagelist/core/settings.kcfg b/messagelist/core/settings.kcfg
index 472b77e..1b4f84f 100644
--- a/messagelist/core/settings.kcfg
+++ b/messagelist/core/settings.kcfg
@@ -23,7 +23,6 @@
     <entry name="ShowQuickSearch" type="Bool">
       <default>true</default>
     </entry>
-    <entry name="TagSelected" type="String"/>
   </group>
 
   <group name="MessageListView::Colors">
diff --git a/messagelist/widget.cpp b/messagelist/widget.cpp
index c98a6de..1a3fa6a 100644
--- a/messagelist/widget.cpp
+++ b/messagelist/widget.cpp
@@ -220,32 +220,19 @@ void Widget::slotTagsFetched(KJob *job)
     }
     Akonadi::TagFetchJob *fetchJob = static_cast<Akonadi::TagFetchJob*>(job);
 
-    KConfigGroup conf( MessageList::Core::Settings::self()->config(),"MessageListView");
-    const QString tagSelected= conf.readEntry(QLatin1String("TagSelected"));
-    if(tagSelected.isEmpty()) {
-        setCurrentStatusFilterItem();
-        return;
-    }
-    const QStringList tagSelectedLst = tagSelected.split(QLatin1Char(','));
-
     addMessageTagItem( SmallIcon( QLatin1String( "mail-flag" ) ), i18n( "All" ), QString() );
 
     QStringList tagFound;
     foreach( const Akonadi::Tag &akonadiTag, fetchJob->tags() ) {
-        if(tagSelectedLst.contains(akonadiTag.url().url())) {
-            tagFound.append(akonadiTag.url().url());
-            QString iconName = QLatin1String( "mail-tagged" );
-            const QString label = akonadiTag.name();
-            const QString id = akonadiTag.url().url();
-            Akonadi::TagAttribute *attr = akonadiTag.attribute<Akonadi::TagAttribute>();
-            if (attr) {
-                iconName = attr->iconName();
-            }
-            addMessageTagItem( SmallIcon( iconName ), label, QVariant( id ) );
+        QString iconName = QLatin1String( "mail-tagged" );
+        const QString label = akonadiTag.name();
+        const QString id = akonadiTag.url().url();
+        Akonadi::TagAttribute *attr = akonadiTag.attribute<Akonadi::TagAttribute>();
+        if (attr) {
+            iconName = attr->iconName();
         }
+        addMessageTagItem( SmallIcon( iconName ), label, QVariant( id ) );
     }
-    conf.writeEntry(QLatin1String("TagSelected"), tagFound);
-    conf.sync();
 
     setCurrentStatusFilterItem();
 }




More information about the commits mailing list