diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2015-04-09 13:08:24 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2015-04-09 13:08:24 -0500 |
| commit | 8d282df37c72ff27a006ff928f1b151d98aa0e45 (patch) | |
| tree | 89d5ecc46c7e674e753e907f48d8e8acd4935d1a /src/actions-live.cpp | |
| parent | d5002c6b27cf0e00828555a10e89778008d6cd01 (diff) | |
| parent | 49f49d4c18c2cc77a1a305c93a74e9e8ec903526 (diff) | |
| download | ayatana-indicator-datetime-8d282df37c72ff27a006ff928f1b151d98aa0e45.tar.gz ayatana-indicator-datetime-8d282df37c72ff27a006ff928f1b151d98aa0e45.tar.bz2 ayatana-indicator-datetime-8d282df37c72ff27a006ff928f1b151d98aa0e45.zip | |
sync with trunk
Diffstat (limited to 'src/actions-live.cpp')
| -rw-r--r-- | src/actions-live.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/actions-live.cpp b/src/actions-live.cpp index 4d1f770..3cbfb78 100644 --- a/src/actions-live.cpp +++ b/src/actions-live.cpp @@ -135,12 +135,19 @@ void LiveActions::phone_open_alarm_app() void LiveActions::phone_open_appointment(const Appointment& appt) { - if (!appt.url.empty()) - dispatch_url(appt.url); - else if (appt.is_ubuntu_alarm()) - phone_open_alarm_app(); - else - phone_open_calendar_app(DateTime::NowLocal()); + if (!appt.activation_url.empty()) + { + dispatch_url(appt.activation_url); + } + else switch (appt.type) + { + case Appointment::UBUNTU_ALARM: + phone_open_alarm_app(); + break; + + default: + phone_open_calendar_app(appt.begin); + } } void LiveActions::phone_open_calendar_app(const DateTime&) |