← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdepim/vivid

« back to all changes in this revision

Viewing changes to mailcommon/collectiongeneralpage.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Jonathan Riddell, Rohan Garg, Scott Kitterman
  • Date: 2012-11-21 13:12:36 UTC
  • mfrom: (0.2.33)
  • Revision ID: package-import@ubuntu.com-20121121131236-32ijw9a2txrar80k
Tags: 4:4.9.80-0ubuntu1
[ Jonathan Riddell ]
* New upstream beta release

[ Rohan Garg ]
* Add nepomuk-core-dev to build-deps

[ Scott Kitterman ]
* Add new package, libpimcommon4
  - Add libpimcommon4.install
  - Add to debian/control, including kdepim-dbg and kdepim-dev depends
  - Add to kdepim-dev.install
* Remove usr/bin/backupmail and related files from kmail.install as they are
  not provided by upstream anymore
* Add usr/bin/pimsettingexporter and related files to kmail.install
* Add libnepomukwidgets-dev to build-depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
mailcommon/collectiongeneralpage.cpp
22
22
#include "mailkernel.h"
23
23
#include "mailutil.h"
24
24
 
 
25
#include "pimcommon/pimutil.h"
25
26
#include <Akonadi/AgentManager>
26
27
#include <Akonadi/AttributeFactory>
27
28
#include <Akonadi/Collection>
552
553
      annotations[ KOLAB_FOLDERTYPE ] = kolabName;
553
554
    }
554
555
  }
555
 
 
556
 
  annotationsAttribute->setAnnotations( annotations );
 
556
  if( annotations.isEmpty() ) {
 
557
    collection.removeAttribute<CollectionAnnotationsAttribute>();
 
558
  } else {
 
559
    annotationsAttribute->setAnnotations( annotations );
 
560
  }
557
561
 
558
562
  if ( mFolderCollection ) {
559
563
    mFolderCollection->setIdentity( mIdentityComboBox->currentIdentity() );