logo       

branches/KDE/4.3/kdepim/korganizer (merge): msg#12799

kde-commits

Subject: branches/KDE/4.3/kdepim/korganizer (merge)

SVN commit 1005094 by tmcguire:

Backport r1004665 by tmcguire from trunk to the 4.3 branch:

SVN_MERGE
Merged revisions 1000998 via svnmerge from
svn+ssh://tmcguire@xxxxxxxxxxx/home/kde/branches/kdepim/enterprise4/kdepim

................
r1000998 | winterz | 2009-07-22 14:49:03 +0200 (Wed, 22 Jul 2009) | 12 lines

Merged revisions 1000859 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
r1000859 | vkrause | 2009-07-22 04:43:06 -0400 (Wed, 22 Jul 2009) | 5 lines

Allow to edit the organizer field if it is empty.

Kolab issue 3771
MERGE: e4, trunk, 4.3
........
................



M +1 -1 koattendeeeditor.cpp


--- branches/KDE/4.3/kdepim/korganizer/koattendeeeditor.cpp #1005093:1005094
@@ -294,7 +294,7 @@
qDeleteAll( mDelAttendees );
mDelAttendees.clear();

- if ( KOPrefs::instance()->thatIsMe( incidence->organizer().email() ) ) {
+ if ( KOPrefs::instance()->thatIsMe( incidence->organizer().email() ) ||
incidence->organizer().isEmpty() ) {
//TODO: make a new private method for creating the mOrganizerCombo
//and use it here and initOrganizerWidgets() above.
if ( !mOrganizerCombo ) {

<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

News | Mail Home | sitemap | FAQ | advertise