Merge tag 'upstream/0.6.7'

Upstream version 0.6.7

1 files changed, 21 insertions, 10 deletions

diff --git a/src/actionGroups/groupRegistry.vala b/src/actionGroups/groupRegistry.vala
index ebf34ba..c97cf95 100644
--- a/src/actionGroups/groupRegistry.vala
+++ b/src/actionGroups/groupRegistry.vala
@@ -57,6 +57,10 @@ public class GroupRegistry : GLib.Object {
         types.add(typeof(BookmarkGroup).name());
         descriptions.set(typeof(BookmarkGroup).name(), type_description);
 
+        type_description = ClipboardGroup.register();
+        types.add(typeof(ClipboardGroup).name());
+        descriptions.set(typeof(ClipboardGroup).name(), type_description);
+
         type_description = DevicesGroup.register();
         types.add(typeof(DevicesGroup).name());
         descriptions.set(typeof(DevicesGroup).name(), type_description);
@@ -72,10 +76,6 @@ public class GroupRegistry : GLib.Object {
         type_description = WindowListGroup.register();
         types.add(typeof(WindowListGroup).name());
         descriptions.set(typeof(WindowListGroup).name(), type_description);
-
-        type_description = WorkspaceWindowListGroup.register();
-        types.add(typeof(WorkspaceWindowListGroup).name());
-        descriptions.set(typeof(WorkspaceWindowListGroup).name(), type_description);
     }
 
     /////////////////////////////////////////////////////////////////////
@@ -84,12 +84,23 @@ public class GroupRegistry : GLib.Object {
 
     public static ActionGroup? create_group(string type_id, string parent_id) {
         switch (type_id) {
-            case "bookmarks": return new BookmarkGroup(parent_id);
-            case "devices": return new DevicesGroup(parent_id);
-            case "menu": return new MenuGroup(parent_id);
-            case "session": return new SessionGroup(parent_id);
-            case "window_list": return new WindowListGroup(parent_id);
-            case "workspace_window_list": return new WorkspaceWindowListGroup(parent_id);
+            case "bookmarks":
+                return new BookmarkGroup(parent_id);
+            case "clipboard":
+                return new ClipboardGroup(parent_id);
+            case "devices":
+                return new DevicesGroup(parent_id);
+            case "menu":
+                return new MenuGroup(parent_id);
+            case "session":
+                return new SessionGroup(parent_id);
+            case "window_list":
+                return new WindowListGroup(parent_id);
+            // deprecated
+            case "workspace_window_list":
+                var group = new WindowListGroup(parent_id);
+                group.current_workspace_only = true;
+                return group;
         }
 
         return null;