Merge tag 'upstream/0.5.7'

Upstream version 0.5.7

1 files changed, 5 insertions, 8 deletions

diff --git a/src/gui/indicator.vala b/src/gui/indicator.vala
index 18d4e68..1277fb8 100644
--- a/src/gui/indicator.vala
+++ b/src/gui/indicator.vala
@@ -68,12 +68,9 @@ public class Indicator : GLib.Object {
 
     public Indicator() {
         string icon = "";
+        var screen = (Gdk.X11.Screen)Gdk.Screen.get_default();
 
-        #if HAVE_GTK_3
-            if (Gdk.X11Screen.get_window_manager_name(Gdk.Screen.get_default()) == "Mutter")
-        #else
-            if (Gdk.x11_screen_get_window_manager_name(Gdk.Screen.get_default()) == "Mutter")
-        #endif
+        if (screen.get_window_manager_name() == "Mutter")
             icon = "gnome-pie";
         else
             icon = "gnome-pie-symbolic";
@@ -114,7 +111,7 @@ public class Indicator : GLib.Object {
         this.prefs = new PreferencesWindow();
 
         // preferences item
-        var item = new Gtk.ImageMenuItem.from_stock (Gtk.Stock.PREFERENCES, null);
+        var item = new Gtk.ImageMenuItem.with_mnemonic(_("_Preferences"));
         item.activate.connect(() => {
             this.prefs.show();
         });
@@ -123,7 +120,7 @@ public class Indicator : GLib.Object {
         menu.append(item);
 
         // about item
-        item = new Gtk.ImageMenuItem.from_stock (Gtk.Stock.ABOUT, null);
+        item = new Gtk.ImageMenuItem.with_mnemonic(_("_About"));
         item.show();
         item.activate.connect(() => {
             var about = new AboutWindow();
@@ -138,7 +135,7 @@ public class Indicator : GLib.Object {
         menu.append(sepa);
 
         // quit item
-        item = new Gtk.ImageMenuItem.from_stock(Gtk.Stock.QUIT, null);
+        item = new Gtk.ImageMenuItem.with_mnemonic(_("_Quit"));
         item.activate.connect(Gtk.main_quit);
         item.show();
         menu.append(item);