← Back to branch summary

~ubuntu-branches/ubuntu/wily/qtorganizer5-eds/wily

« back to all changes in this revision

Viewing changes to organizer/qorganizer-eds-engine.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Ubuntu daily release, Renato Araujo Oliveira Filho
  • Date: 2014-11-21 13:32:56 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20141121133256-a5835dhswm55qk2s
Tags: 0.1.1+15.04.20141121.1-0ubuntu1
https://launchpad.net/bugs/1384830
https://launchpad.net/bugs/1362781
[ Ubuntu daily release ]
* New rebuild forced

[ Renato Araujo Oliveira Filho ]
* Fixed attendee property parse. (LP: #1384830)
* Fixed recurrence rule limit date. (LP: #1362781)

Show diffs side-by-side

added added

removed removed

Lines of Context:
organizer/qorganizer-eds-engine.cpp
1558
1558
        ECalComponentAttendee *attendee = static_cast<ECalComponentAttendee *>(attendeeIter->data);
1559
1559
        QOrganizerEventAttendee qAttendee;
1560
1560
 
 
1561
        qAttendee.setAttendeeId(QString::fromUtf8(attendee->member));
1561
1562
        qAttendee.setName(QString::fromUtf8(attendee->cn));
1562
 
        qAttendee.setEmailAddress(QString::fromUtf8(attendee->member));
 
1563
        qAttendee.setEmailAddress(QString::fromUtf8(attendee->value));
1563
1564
 
1564
1565
        switch(attendee->role) {
1565
1566
        case ICAL_ROLE_REQPARTICIPANT:
1571
1572
        case ICAL_ROLE_CHAIR:
1572
1573
            qAttendee.setParticipationRole(QOrganizerEventAttendee::RoleChairperson);
1573
1574
            break;
 
1575
        case ICAL_ROLE_X:
 
1576
            qAttendee.setParticipationRole(QOrganizerEventAttendee::RoleHost);
 
1577
            break;
1574
1578
        case ICAL_ROLE_NONE:
1575
1579
        default:
1576
1580
            qAttendee.setParticipationRole(QOrganizerEventAttendee::RoleNonParticipant);
1999
2003
                    break;
2000
2004
            }
2001
2005
 
2002
 
            if (qRule.limitDate().isValid()) {
2003
 
                rule->until = icaltime_from_timet(QDateTime(qRule.limitDate()).toTime_t(), TRUE);
 
2006
            switch (qRule.limitType()) {
 
2007
            case QOrganizerRecurrenceRule::DateLimit:
 
2008
                if (qRule.limitDate().isValid()) {
 
2009
                    rule->until = icaltime_from_timet(QDateTime(qRule.limitDate()).toTime_t(), TRUE);
 
2010
                }
 
2011
                break;
 
2012
            case QOrganizerRecurrenceRule::CountLimit:
 
2013
                if (qRule.limitCount() > 0) {
 
2014
                    rule->count = qRule.limitCount();
 
2015
                }
 
2016
                break;
 
2017
            case QOrganizerRecurrenceRule::NoLimit:
 
2018
            default:
2004
2019
                rule->count = ICAL_RECURRENCE_ARRAY_MAX;
2005
 
            } else if (qRule.limitCount() > 0) {
2006
 
                rule->count = qRule.limitCount();
2007
2020
            }
2008
2021
 
2009
2022
            QSet<int> positions = qRule.positions();
2085
2098
void QOrganizerEDSEngine::parseAttendeeList(const QOrganizerItem &item, ECalComponent *comp)
2086
2099
{
2087
2100
    GSList *attendeeList = 0;
 
2101
 
2088
2102
    Q_FOREACH(const QOrganizerEventAttendee &attendee, item.details(QOrganizerItemDetail::TypeEventAttendee)) {
2089
2103
        ECalComponentAttendee *calAttendee = g_new0(ECalComponentAttendee, 1);
2090
2104
 
 
2105
        calAttendee->member = g_strdup(attendee.attendeeId().toUtf8().constData());
2091
2106
        calAttendee->cn = g_strdup(attendee.name().toUtf8().constData());
2092
 
        calAttendee->value = g_strconcat("MAILTO:", attendee.emailAddress().toUtf8().constData(), NULL);
 
2107
        calAttendee->value = g_strdup(attendee.emailAddress().toUtf8().constData());
 
2108
 
2093
2109
        switch(attendee.participationRole()) {
2094
2110
        case QOrganizerEventAttendee::RoleRequiredParticipant:
2095
2111
            calAttendee->role = ICAL_ROLE_REQPARTICIPANT;
2100
2116
        case QOrganizerEventAttendee::RoleChairperson:
2101
2117
            calAttendee->role = ICAL_ROLE_CHAIR;
2102
2118
            break;
 
2119
        case QOrganizerEventAttendee::RoleHost:
 
2120
            calAttendee->role = ICAL_ROLE_X;
 
2121
            break;
2103
2122
        default:
2104
2123
            calAttendee->role = ICAL_ROLE_NONE;
2105
2124
        }
2131
2150
        attendeeList = g_slist_append(attendeeList, calAttendee);
2132
2151
    }
2133
2152
    e_cal_component_set_attendee_list(comp, attendeeList);
 
2153
    e_cal_component_free_attendee_list(attendeeList);
2134
2154
}
2135
2155
 
2136
2156
bool QOrganizerEDSEngine::hasRecurrence(ECalComponent *comp)