summaryrefslogtreecommitdiff
path: root/src/gui/indicator.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-24 11:03:07 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-24 11:03:07 +0100
commit4b7a48bda37da6ac1c08822c7c888be6bf7cb751 (patch)
tree919bbd1c7eeca956a4cb20c8e3b88c9a2e27f821 /src/gui/indicator.vala
parent751a72bc2d2f54e27206a32cd4b7b17e9837228e (diff)
parentb683ce2789d95b2e9f221e75adc30efd91cfb901 (diff)
Merge tag 'upstream/0.5.7'
Upstream version 0.5.7
Diffstat (limited to 'src/gui/indicator.vala')
-rw-r--r--src/gui/indicator.vala13
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);