diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-01-16 21:23:57 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2014-01-16 21:23:57 -0600 |
| commit | 2e9d3bb48946ccebf49cff64ab5de67e5714e1e3 (patch) | |
| tree | aa8fc3b514a49b58dc797a2083af5f6417adf0f5 /src | |
| parent | 6f2e235e660094f6ec27a0a099428ac3fe852ff7 (diff) | |
| download | ayatana-indicator-datetime-2e9d3bb48946ccebf49cff64ab5de67e5714e1e3.tar.gz ayatana-indicator-datetime-2e9d3bb48946ccebf49cff64ab5de67e5714e1e3.tar.bz2 ayatana-indicator-datetime-2e9d3bb48946ccebf49cff64ab5de67e5714e1e3.zip | |
get timezone, clock tests running again with Settings & State
Diffstat (limited to 'src')
| -rw-r--r-- | src/actions-live.cpp | 9 | ||||
| -rw-r--r-- | src/actions.cpp | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/actions-live.cpp b/src/actions-live.cpp index 08e1466..c699aff 100644 --- a/src/actions-live.cpp +++ b/src/actions-live.cpp @@ -39,12 +39,12 @@ void LiveActions::open_phone_settings() g_message("%s", G_STRFUNC); } -void LiveActions::open_phone_clock() +void LiveActions::open_phone_clock_app() { g_message("%s", G_STRFUNC); } -void LiveActions::open_phone_planner() +void LiveActions::open_planner() { g_message("%s", G_STRFUNC); } @@ -54,11 +54,6 @@ void LiveActions::open_planner_at(const DateTime&) g_message("%s", G_STRFUNC); } -void LiveActions::open_calendar_at(const DateTime&) -{ - g_message("%s", G_STRFUNC); -} - void LiveActions::open_appointment(const std::string& uid) { g_message("%s - %s", G_STRFUNC, uid.c_str()); diff --git a/src/actions.cpp b/src/actions.cpp index 52ee1eb..0df7d53 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -130,7 +130,7 @@ GVariant* create_default_header_state() return g_variant_builder_end(&b); } -GVariant* create_calendar_state(std::shared_ptr<State>& state) +GVariant* create_calendar_state(const std::shared_ptr<State>& state) { gboolean days[32] = { 0 }; for(const auto& appt : state->planner->thisMonth.get()) @@ -138,7 +138,7 @@ GVariant* create_calendar_state(std::shared_ptr<State>& state) GVariantBuilder day_builder; g_variant_builder_init(&day_builder, G_VARIANT_TYPE("ai")); - for (int i=0; i<G_N_ELEMENTS(days); i++) + for (guint i=0; i<G_N_ELEMENTS(days); i++) if (days[i]) g_variant_builder_add(&day_builder, "i", i); @@ -165,7 +165,7 @@ GVariant* create_calendar_state(std::shared_ptr<State>& state) **** ***/ -Actions::Actions(std::shared_ptr<State>& state): +Actions::Actions(const std::shared_ptr<State>& state): m_state(state), m_actions(g_simple_action_group_new()) { |