summaryrefslogtreecommitdiff
path: root/src/actionGroups
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-08-26 16:35:54 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-08-26 16:35:54 +0200
commit4b19e75939c5b7122d1429f6f258d4b83cd90dde (patch)
treec1af105b3b9f98326bb59a7c0a5f516f15b9f1f4 /src/actionGroups
parentd9c48b3d78430c190a8077f0ec1fb65de1fc8b09 (diff)
Imported Upstream version 0.6.9upstream/0.6.9
Diffstat (limited to 'src/actionGroups')
-rw-r--r--src/actionGroups/actionGroup.vala2
-rw-r--r--src/actionGroups/bookmarkGroup.vala2
-rw-r--r--src/actionGroups/clipboardGroup.vala2
-rw-r--r--src/actionGroups/devicesGroup.vala2
-rw-r--r--src/actionGroups/groupRegistry.vala2
-rw-r--r--src/actionGroups/menuGroup.vala2
-rw-r--r--src/actionGroups/sessionGroup.vala2
-rw-r--r--src/actionGroups/windowListGroup.vala22
8 files changed, 19 insertions, 17 deletions
diff --git a/src/actionGroups/actionGroup.vala b/src/actionGroups/actionGroup.vala
index 85488ad..3bc7086 100644
--- a/src/actionGroups/actionGroup.vala
+++ b/src/actionGroups/actionGroup.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2015 by Simon Schneegans
+// Copyright (c) 2011-2016 by Simon Schneegans
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/src/actionGroups/bookmarkGroup.vala b/src/actionGroups/bookmarkGroup.vala
index 791d609..3a36be6 100644
--- a/src/actionGroups/bookmarkGroup.vala
+++ b/src/actionGroups/bookmarkGroup.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2015 by Simon Schneegans
+// Copyright (c) 2011-2016 by Simon Schneegans
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/src/actionGroups/clipboardGroup.vala b/src/actionGroups/clipboardGroup.vala
index 58409de..51c3d1a 100644
--- a/src/actionGroups/clipboardGroup.vala
+++ b/src/actionGroups/clipboardGroup.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2015 by Simon Schneegans
+// Copyright (c) 2011-2016 by Simon Schneegans
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/src/actionGroups/devicesGroup.vala b/src/actionGroups/devicesGroup.vala
index e18f4c0..1ea8607 100644
--- a/src/actionGroups/devicesGroup.vala
+++ b/src/actionGroups/devicesGroup.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2015 by Simon Schneegans
+// Copyright (c) 2011-2016 by Simon Schneegans
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/src/actionGroups/groupRegistry.vala b/src/actionGroups/groupRegistry.vala
index c97cf95..89cde6a 100644
--- a/src/actionGroups/groupRegistry.vala
+++ b/src/actionGroups/groupRegistry.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2015 by Simon Schneegans
+// Copyright (c) 2011-2016 by Simon Schneegans
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/src/actionGroups/menuGroup.vala b/src/actionGroups/menuGroup.vala
index ccb5407..353128f 100644
--- a/src/actionGroups/menuGroup.vala
+++ b/src/actionGroups/menuGroup.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2015 by Simon Schneegans
+// Copyright (c) 2011-2016 by Simon Schneegans
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/src/actionGroups/sessionGroup.vala b/src/actionGroups/sessionGroup.vala
index 42afafc..5d47674 100644
--- a/src/actionGroups/sessionGroup.vala
+++ b/src/actionGroups/sessionGroup.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2015 by Simon Schneegans
+// Copyright (c) 2011-2016 by Simon Schneegans
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/src/actionGroups/windowListGroup.vala b/src/actionGroups/windowListGroup.vala
index 69029a7..363b8b8 100644
--- a/src/actionGroups/windowListGroup.vala
+++ b/src/actionGroups/windowListGroup.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2015 by Simon Schneegans
+// Copyright (c) 2011-2016 by Simon Schneegans
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -103,8 +103,6 @@ public class WindowListGroup : ActionGroup {
private void update() {
unowned GLib.List<Wnck.Window?> windows = this.screen.get_windows();
- var matcher = Bamf.Matcher.get_default();
-
foreach (var window in windows) {
if (window.get_window_type() == Wnck.WindowType.NORMAL
&& !window.is_skip_pager() && !window.is_skip_tasklist()
@@ -112,18 +110,22 @@ public class WindowListGroup : ActionGroup {
&& window.get_workspace() == this.screen.get_active_workspace()))) {
var application = window.get_application();
- var bamf_app = matcher.get_application_for_xid((uint32)window.get_xid());
+ var icon = application.get_icon_name().down();
+
+ #if HAVE_BAMF
+ var matcher = Bamf.Matcher.get_default();
+ var bamf_app = matcher.get_application_for_xid((uint32)window.get_xid());
+ icon = bamf_app.get_icon();
+ #endif
string name = window.get_name();
- if (name.length > 30)
+ if (name.length > 30) {
name = name.substring(0, 30) + "...";
+ }
+
+ var action = new SigAction(name, icon, "%lu".printf(window.get_xid()));
- var action = new SigAction(
- name,
- (bamf_app == null) ? application.get_icon_name().down() : bamf_app.get_icon(),
- "%lu".printf(window.get_xid())
- );
action.activated.connect((time_stamp) => {
Wnck.Screen.get_default().force_update();