diff options
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | src/backend-dbus/actions.c | 12 | ||||
| -rw-r--r-- | src/service.c | 3 |
4 files changed, 31 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f8a366b..69ac18e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,18 +49,20 @@ add_custom_target (cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src) include_directories (${CMAKE_CURRENT_BINARY_DIR}/src) - -add_subdirectory (src) -add_subdirectory (data) -add_subdirectory (po) - +# testing & coverage if (${enable_tests}) set (GTEST_SOURCE_DIR /usr/src/gtest/src) set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..) set (GTEST_LIBS -lpthread) enable_testing () if (${enable_lcov}) - include(cmake/GCov.cmake) + include(GCov) endif () - add_subdirectory(tests) +endif () + +add_subdirectory (src) +add_subdirectory (data) +add_subdirectory (po) +if (${enable_tests}) + add_subdirectory (tests) endif () diff --git a/debian/changelog b/debian/changelog index d273b09..72588f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +indicator-session (12.10.5+13.10.20130812-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Ensure that GCov CFLAGS & LIBS are set before cmake traverses into + the src/ directory. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 404 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 12 Aug 2013 18:39:36 +0000 + indicator-session (12.10.5+13.10.20130717-0ubuntu1) saucy; urgency=low [ Charles Kerr ] diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c index 9030ca7..fcf850d 100644 --- a/src/backend-dbus/actions.c +++ b/src/backend-dbus/actions.c @@ -169,7 +169,7 @@ set_dm_seat (IndicatorSessionActionsDbus * self, DisplayManagerSeat * seat) if (p->dm_seat != NULL) { g_cancellable_cancel (p->dm_seat_cancellable); - g_clear_object (&p->dm_seat); + g_clear_object (&p->dm_seat_cancellable); g_clear_object (&p->dm_seat); } @@ -734,7 +734,7 @@ my_about (IndicatorSessionActions * self G_GNUC_UNUSED) ***/ static void -my_switch_to_screensaver (IndicatorSessionActions * self) +lock_current_session (IndicatorSessionActions * self) { priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(self)->priv; @@ -744,6 +744,12 @@ my_switch_to_screensaver (IndicatorSessionActions * self) } static void +my_switch_to_screensaver (IndicatorSessionActions * self) +{ + lock_current_session (self); +} + +static void my_switch_to_greeter (IndicatorSessionActions * self) { priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(self)->priv; @@ -762,6 +768,8 @@ my_switch_to_guest (IndicatorSessionActions * self) g_return_if_fail (p->dm_seat != NULL); + lock_current_session (self); + display_manager_seat_call_switch_to_guest (p->dm_seat, "", p->dm_seat_cancellable, NULL, NULL); diff --git a/src/service.c b/src/service.c index ae4eb75..74acd89 100644 --- a/src/service.c +++ b/src/service.c @@ -450,7 +450,7 @@ create_switch_section (IndicatorSessionService * self) } else if (g_hash_table_size (p->users) == 1) { - const char * action = "indicator.switch-to-screensaver"; + const char * action = "indicator.switch-to-greeter"; item = g_menu_item_new (_("Lock"), action); } else @@ -707,7 +707,6 @@ on_greeter_activated (GSimpleAction * a G_GNUC_UNUSED, GVariant * param G_GNUC_UNUSED, gpointer gself) { - indicator_session_actions_switch_to_screensaver (get_backend_actions(gself)); indicator_session_actions_switch_to_greeter (get_backend_actions(gself)); } |