Merge trunk

5 files changed, 50 insertions, 19 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69ac18e..3ed483b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 set (PROJECT_VERSION "13.10.1")
 set (PACKAGE ${CMAKE_PROJECT_NAME})
-set (GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
+set (GETTEXT_PACKAGE indicator-session)
 
 option (enable_tests "Build the package's automatic tests." ON)
 option (enable_lcov "Generate lcov code coverage reports." ON)
diff --git a/data/com.canonical.indicator.session b/data/com.canonical.indicator.session
index 7b1b39e..7b69873 100644
--- a/data/com.canonical.indicator.session
+++ b/data/com.canonical.indicator.session
@@ -9,3 +9,5 @@ ObjectPath=/com/canonical/indicator/session/desktop
 [desktop_greeter]
 ObjectPath=/com/canonical/indicator/session/desktop_greeter
 
+[ubiquity]
+ObjectPath=/com/canonical/indicator/session/desktop_greeter
diff --git a/debian/changelog b/debian/changelog
index d4f1a25..cc78e7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+indicator-session (12.10.5+13.10.20131004-0ubuntu2) UNRELEASED; urgency=low
+
+  * Define "ubiquity" indicator profile, reusing the greeter object. (LP:
+    #1241539)
+
+ -- Dmitrijs Ledkovs <xnox@ubuntu.com>  Fri, 18 Oct 2013 13:18:38 +0100
+
+indicator-session (12.10.5+13.10.20131004-0ubuntu1) saucy; urgency=low
+
+  [ Charles Kerr ]
+  * One-liner to set GETTEXT_PACKAGE explicitly because dh_translations
+    can't handle ${CMAKE_PROJECT_NAME}. (LP: #1233679)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 414
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Fri, 04 Oct 2013 02:30:50 +0000
+
+indicator-session (12.10.5+13.10.20130930-0ubuntu1) saucy; urgency=low
+
+  [ Marc Deslauriers ]
+  * src/service.c: don't switch to greeter when locking screen, as that
+    switches away from the user's audio, power preferences, etc.
+    (LP: #1220201)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 412
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Mon, 30 Sep 2013 06:33:40 +0000
+
 indicator-session (12.10.5+13.10.20130823-0ubuntu1) saucy; urgency=low
 
   [ Charles Kerr ]
diff --git a/src/service.c b/src/service.c
index b7b1ba2..efcb04f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -464,16 +464,15 @@ create_switch_section (IndicatorSessionService * self)
       item = g_menu_item_new (ellipsis ? _("Switch Account…")
                                        : _("Switch Account"), action);
     }
-  else if (g_hash_table_size (p->users) == 1)
-    {
-      const char * action = "indicator.switch-to-greeter";
-      item = g_menu_item_new (_("Lock"), action);
-    }
   else
     {
-      const char * action = "indicator.switch-to-greeter";
-      item = g_menu_item_new (ellipsis ? _("Lock/Switch Account…")
-                                       : _("Lock/Switch Account"), action);
+      const char * action = "indicator.switch-to-screensaver";
+
+      if (g_hash_table_size (p->users) == 1)
+        item = g_menu_item_new (_("Lock"), action);
+      else
+        item = g_menu_item_new (ellipsis ? _("Lock/Switch Account…")
+                                         : _("Lock/Switch Account"), action);
     }
   str = g_settings_get_string (p->keybinding_settings, "screensaver");
   g_menu_item_set_attribute (item, "accel", "s", str);
diff --git a/tests/test-service.cc b/tests/test-service.cc
index b199175..19ec619 100644
--- a/tests/test-service.cc
+++ b/tests/test-service.cc
@@ -504,7 +504,7 @@ TEST_F (ServiceTest, ConfirmationDisabledByBackend)
   bool confirm = confirm_supported && !confirm_disabled;
 
   // confirm that the ellipsis are correct
-  ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.switch-to-greeter"));
+  ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.switch-to-screensaver"));
   ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.logout"));
   if (action_menuitem_exists ("indicator.reboot"))
     ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.reboot"));
@@ -538,7 +538,7 @@ TEST_F (ServiceTest, ConfirmationDisabledByUser)
   bool confirm = confirm_supported && !confirm_disabled;
 
   // confirm that the ellipsis are correct
-  ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.switch-to-greeter"));
+  ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.switch-to-screensaver"));
   ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.logout"));
   if (action_menuitem_exists ("indicator.reboot"))
     ASSERT_EQ (confirm, action_menuitem_label_is_ellipsized ("indicator.reboot"));
@@ -570,7 +570,7 @@ TEST_F (ServiceTest, DefaultMenuItems)
   ASSERT_TRUE (find_menu_item_for_action ("indicator.about", NULL, NULL));
   ASSERT_TRUE (find_menu_item_for_action ("indicator.help", NULL, NULL));
   ASSERT_TRUE (find_menu_item_for_action ("indicator.settings", NULL, NULL));
-  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-greeter", NULL, NULL));
+  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", NULL, NULL));
   ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-guest", NULL, NULL));
   ASSERT_TRUE (find_menu_item_for_action ("indicator.logout", NULL, NULL));
   ASSERT_TRUE (find_menu_item_for_action ("indicator.suspend", NULL, NULL));
@@ -681,10 +681,10 @@ TEST_F (ServiceTest, User)
   };
 
   // Find the switcher menu model.
-  // In BackendMock's default setup, it will only two menuitems: greeter & guest
+  // In BackendMock's default setup, it will only have two menuitems: lockswitch & guest
   int pos = 0;
   GMenuModel * switch_menu = 0;
-  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-greeter", &switch_menu, &pos));
+  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", &switch_menu, &pos));
   ASSERT_EQ (0, pos);
   ASSERT_EQ (2, g_menu_model_get_n_items (switch_menu));
   g_clear_object (&switch_menu);
@@ -709,7 +709,7 @@ TEST_F (ServiceTest, User)
   wait_for_menu_resync ();
 
   // now there should be 7 menuitems: greeter + guest + the five doctors
-  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-greeter", &switch_menu, &pos));
+  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", &switch_menu, &pos));
   ASSERT_EQ (0, pos);
   ASSERT_EQ (7, g_menu_model_get_n_items (switch_menu));
   // confirm that the doctor names are sorted
@@ -727,7 +727,7 @@ TEST_F (ServiceTest, User)
   wait_for_menu_resync ();
 
   // now there should be 5 menuitems: greeter + guest + the three doctors
-  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-greeter", &switch_menu, &pos));
+  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", &switch_menu, &pos));
   ASSERT_EQ (0, pos);
   ASSERT_EQ (5, g_menu_model_get_n_items (switch_menu));
   // confirm that the doctor names are sorted
@@ -744,7 +744,7 @@ TEST_F (ServiceTest, User)
   wait_for_menu_resync ();
 
   // now there should be 5 menuitems: greeter + guest + the three doctors
-  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-greeter", &switch_menu, &pos));
+  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", &switch_menu, &pos));
   ASSERT_EQ (0, pos);
   ASSERT_EQ (5, g_menu_model_get_n_items (switch_menu));
   g_clear_object (&switch_menu);
@@ -770,7 +770,7 @@ TEST_F (ServiceTest, User)
   g_object_get (service, "max-users", &max_users, NULL);
   ASSERT_EQ (2, max_users);
   wait_for_menu_resync ();
-  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-greeter", &switch_menu, &pos));
+  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", &switch_menu, &pos));
   ASSERT_EQ (0, pos);
   ASSERT_EQ (4, g_menu_model_get_n_items (switch_menu));
   check_label ("First Doctor", switch_menu, 2);
@@ -800,7 +800,7 @@ TEST_F (ServiceTest, User)
   users[10]->is_logged_in = true;
   indicator_session_users_changed (mock_users, users[10]->uid);
   wait_for_menu_resync ();
-  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-greeter", &switch_menu, &pos));
+  ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", &switch_menu, &pos));
   ASSERT_EQ (0, pos);
   ASSERT_EQ (9, g_menu_model_get_n_items (switch_menu));
   check_label ("Eleventh Doctor", switch_menu, 2);