Merge lp:~3v1n0/unity-greeter/logo-update-rebuild into lp:unity-greeter

[Marco Trevisan (Treviño)]

Bump version and actually update logo

[lp:~3v1n0/unity-greeter/logo-update-rebuild]

2409. By Marco Trevisan (Treviño) on 2018-03-14

menubar: fix compilation errors with recent vala

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-12-06 13:47:37 +0000
+++ debian/changelog	2018-03-14 16:42:20 +0000
@@ -1,7 +1,12 @@
-unity-greeter (17.10.0-0ubuntu2) UNRELEASED; urgency=medium
+unity-greeter (18.04.0-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Dale Beaudoin ]
   * Update greeter logo to 18.04 LTS
 
+  [ Marco Trevisan (Treviño) ]
+  * Bump version and actually update logo
+  * menubar: fix compilation errors with recent vala
+
  -- Dale Beaudoin <[e-mail]>  Wed, 06 Dec 2017 08:45:55 -0500
 
 unity-greeter (17.10.0-0ubuntu1) artful; urgency=medium

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2016-10-27 01:17:43 +0000
+++ src/menubar.vala	2018-03-14 16:42:20 +0000
@@ -45,7 +45,7 @@
         if (entry.accessible_desc != null)
             get_accessible ().set_name (entry.accessible_desc);
         if (entry.menu != null)
-            set_submenu (entry.menu as Gtk.Widget);
+            set_submenu (entry.menu);
 
         if (has_visible_child ())
             show ();
@@ -216,7 +216,7 @@
         image.show ();
         hbox.add (image);
         a11y_item.show ();
-        a11y_item.set_submenu (new Gtk.Menu () as Gtk.Widget);
+        a11y_item.set_submenu (new Gtk.Menu ());
         onscreen_keyboard_item = new Gtk.CheckMenuItem.with_label (_("Onscreen keyboard"));
         onscreen_keyboard_item.toggled.connect (keyboard_toggled_cb);
         onscreen_keyboard_item.show ();