[Kde-pim] Review Request 111743: remove the confusion for ServiceType

[Guy Maurel]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/111743/
-----------------------------------------------------------

Review request for KDEPIM-Libraries, Kevin Krammer, Till Adam, and Volker Krause.


Description
-------

There is a confusion for the enum ServiceType.
The file kdepimlibs/akonadi/servermanager.h defines 4 menbers.
The file akonadi/shared/akdbus.h defines 6 members.

This gives a confusion for the value of UpgradeIndicator, in the first case it is 3, in the second case 5.

This leads to a error for the code at kdepimlibs/akonadi/servermanager.cpp:224
  if ( serverUpgrading )
    return Upgrading;

I propose an import from akonadi/shared/akdbus.h, which will better support the next changes.


Diffs
-----

  akonadi/agentbase.cpp acbacc3 
  akonadi/agentinstance.cpp 8af5edc 
  akonadi/agentmanager.cpp 03e4b1f 
  akonadi/changenotificationdependenciesfactory.cpp a5d5cc0 
  akonadi/entitytreemodel_p.cpp 039f4dc 
  akonadi/selftestdialog.cpp 9231722 
  akonadi/servermanager.h 4425395 
  akonadi/servermanager.cpp 45ab8c3 
  akonadi/session.cpp 2e78f94 

Diff: http://git.reviewboard.kde.org/r/111743/diff/


Testing
-------


Thanks,

Guy Maurel

_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/