[Kde-pim] Review Request 119292: Remove the conflict resolution dialog from akonadi.

[Boudewijn Rempt]

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

Review request for KDEPIM-Libraries.


Repository: kdepimlibs


Description
-------

When reading mail with kmail, this diff-like dialog pops up, sometimes twenty, thirty times in a row. A library shouldn't popup dialogs, and users shouldn't be bothered with having to figure out something diff-like. No doubt always choosing "other" is technically wrong, but showing a dialog like this makes the entire application unusable.


Diffs
-----

  akonadi/CMakeLists.txt a6fc0aa 
  akonadi/conflicthandling/conflicthandler.cpp 2de0948 
  akonadi/conflicthandling/conflictresolvedialog.cpp 142b581 
  akonadi/conflicthandling/conflictresolvedialog_p.h 40c673b 

Diff: https://git.reviewboard.kde.org/r/119292/diff/


Testing
-------


Thanks,

Boudewijn Rempt

_______________________________________________
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/