← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kdepimlibs/trusty

« back to all changes in this revision

Viewing changes to akonadi/kmime/specialmailcollections.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg, Rohan Garg, Philip Muškovac
  • Date: 2013-11-23 17:36:44 UTC
  • mfrom: (1.1.102)
  • Revision ID: package-import@ubuntu.com-20131123173644-p5ow94192ezsny8g
Tags: 4:4.11.80-0ubuntu1
[ Rohan Garg ]
* New upstream beta release
  - Bump akonadi requirement to 1.10.45
  - Update install files
  - Update symbols

[ Philip Muškovac ]
* kdepimlibs-dev/-dbg breaks/replaces kdepim-runtime/-dbg (<< 4:4.11.80)

Show diffs side-by-side

added added

removed removed

Lines of Context:
akonadi/kmime/specialmailcollections.cpp
114
114
  return SpecialCollections::registerCollection( enumToType( type ), collection );
115
115
}
116
116
 
 
117
bool SpecialMailCollections::unregisterCollection( const Collection &collection )
 
118
{
 
119
  if (collection != Akonadi::SpecialMailCollections::self()->defaultCollection( Akonadi::SpecialMailCollections::Trash )) {
 
120
    return SpecialCollections::unregisterCollection( collection );
 
121
  } else {
 
122
    return false;
 
123
  }
 
124
}
 
125
 
117
126
bool SpecialMailCollections::hasDefaultCollection( Type type ) const
118
127
{
119
128
  return SpecialCollections::hasDefaultCollection( enumToType( type ) );
151
160
  default:
152
161
     break;
153
162
  }
154
 
  if(!defaultI18n.isEmpty()) {
155
 
    if(collection.hasAttribute<Akonadi::EntityDisplayAttribute>()) {
156
 
      if( collection.attribute<Akonadi::EntityDisplayAttribute>()->displayName() != defaultI18n) {
 
163
  if (!defaultI18n.isEmpty()) {
 
164
    if (collection.hasAttribute<Akonadi::EntityDisplayAttribute>()) {
 
165
      if ( collection.attribute<Akonadi::EntityDisplayAttribute>()->displayName() != defaultI18n) {
157
166
          collection.attribute<Akonadi::EntityDisplayAttribute>()->setDisplayName( defaultI18n );
158
167
          Akonadi::CollectionModifyJob *job = new Akonadi::CollectionModifyJob( collection, this );
159
168
          connect( job, SIGNAL(result(KJob*)), this, SLOT(slotCollectionModified(KJob*)) );