Merge lp:~robert-ancell/unity-greeter/show-hostname into lp:unity-greeter

[Robert Ancell]

Add option to disable hostname in login screen

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1017
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-greeter-ci/24/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

No-one else is checking these MPs...

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-greeter-autolanding/12/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3779
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-autolanding/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-autolanding/4

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/unity-greeter/show-hostname]

1018. By Robert Ancell on 2014-01-07

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1018
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/26/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/9/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/26/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/unity-greeter/show-hostname]

1019. By Robert Ancell on 2014-01-17

Kick Jenkins

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1019
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/31/rebuild

review: Approve (continuous-integration)

=== modified file 'data/com.canonical.unity-greeter.gschema.xml'
--- data/com.canonical.unity-greeter.gschema.xml	2013-10-03 13:59:34 +0000
+++ data/com.canonical.unity-greeter.gschema.xml	2014-01-17 20:00:51 +0000
@@ -17,6 +17,10 @@
       <default>true</default>
       <summary>Whether to draw an overlay grid</summary>
     </key>
+    <key name="show-hostname" type="b">
+      <default>true</default>
+      <summary>Whether to show the hostname in the menubar</summary>
+    </key>
     <key name="logo" type="s">
       <default>'/usr/share/unity-greeter/logo.png'</default>
       <summary>Logo file to use</summary>

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2013-11-13 04:28:36 +0000
+++ src/main-window.vala	2014-01-17 20:00:51 +0000
@@ -113,6 +113,7 @@
         hbox.add (align);
 
         back_button = new FlatButton ();
+        back_button.get_accessible ().set_name (_("Back"));
         back_button.focus_on_click = false;
         var image = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "arrow_left.png", null));
         image.show ();

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2013-10-03 13:59:34 +0000
+++ src/menubar.vala	2014-01-17 20:00:51 +0000
@@ -122,19 +122,22 @@
 
         pack_direction = Gtk.PackDirection.RTL;
 
-        var label = new Gtk.Label (Posix.utsname ().nodename);
-        label.show ();
-        var hostname_item = new Gtk.MenuItem ();
-        hostname_item.add (label);
-        hostname_item.sensitive = false;
-        hostname_item.right_justified = true;
-        hostname_item.show ();
-        append (hostname_item);
+        if (UGSettings.get_boolean (UGSettings.KEY_SHOW_HOSTNAME))
+        {
+            var label = new Gtk.Label (Posix.utsname ().nodename);
+            label.show ();
+            var hostname_item = new Gtk.MenuItem ();
+            hostname_item.add (label);
+            hostname_item.sensitive = false;
+            hostname_item.right_justified = true;
+            hostname_item.show ();
+            append (hostname_item);
 
-        /* Hack to get a label showing on the menubar */
-        label.ensure_style ();
-        var fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL);
-        label.override_color (Gtk.StateFlags.INSENSITIVE, fg);
+            /* Hack to get a label showing on the menubar */
+            label.ensure_style ();
+            var fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL);
+            label.override_color (Gtk.StateFlags.INSENSITIVE, fg);
+        }
 
         /* Prevent dragging the window by the menubar */
         try

=== modified file 'src/settings.vala'
--- src/settings.vala	2013-09-20 18:28:43 +0000
+++ src/settings.vala	2014-01-17 20:00:51 +0000
@@ -24,6 +24,7 @@
     public static const string KEY_BACKGROUND_COLOR = "background-color";
     public static const string KEY_DRAW_USER_BACKGROUNDS = "draw-user-backgrounds";
     public static const string KEY_DRAW_GRID = "draw-grid";
+    public static const string KEY_SHOW_HOSTNAME = "show-hostname";
     public static const string KEY_LOGO = "logo";
     public static const string KEY_BACKGROUND_LOGO = "background-logo";
     public static const string KEY_THEME_NAME = "theme-name";