Merge lp:~charlesk/indicator-datetime/lp-1296585-fix-settings-menuitem-label into lp:indicator-datetime/14.04

[Charles Kerr]

Change the desktop menu's settings menuitem's label to match the spec.

Change the desktop menu's settings menuitem's label to match the spec.

[Charles Kerr (charlesk)]

> Ensure the project compiles and the test suite executes without error

Yep

> Ensure that non-obvious code has comments explaining it

This is a trivial MP

> If the change works on specific profiles, please include those in the merge description.

Affects: Desktop

[Ted Gould (ted)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/218/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/98
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/98/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/218/rebuild

review: Approve (continuous-integration)

=== modified file 'src/menu.cpp'
--- src/menu.cpp	2014-03-24 15:51:00 +0000
+++ src/menu.cpp	2014-03-24 15:51:00 +0000
@@ -388,15 +388,17 @@
     GMenuModel* create_settings_section(Profile profile)
     {
         auto menu = g_menu_new();
+        const char * action_name;
 
         if (profile == Desktop)
-        {
-            g_menu_append (menu, _("Date & Time Settings…"), "indicator.desktop.open-settings-app");
-        }
+            action_name = "indicator.desktop.open-settings-app";
         else if (profile == Phone)
-        {
-            g_menu_append (menu, _("Time & Date settings…"), "indicator.phone.open-settings-app");
-        }
+            action_name = "indicator.phone.open-settings-app";
+        else
+            action_name = nullptr;
+
+        if (action_name != nullptr)
+            g_menu_append (menu, _("Time & Date settings…"), action_name);
 
         return G_MENU_MODEL (menu);
     }