summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-05-03 07:25:38 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-05-03 07:25:38 +0200
commitdaab38595df60c0ef3e142c195382cb35d448203 (patch)
tree4186938621912272570b4187a4d8ef8e3ca87b47 /src/actions
parentfbd5a9eb0d29bdfd9f5f0892190452e17871afd9 (diff)
parenta1c05d93bbb3c1bdb0c0fed9d7110804037cfd55 (diff)
Merge tag 'upstream/0.6.2'
Upstream version 0.6.2
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/action.vala2
-rw-r--r--src/actions/appAction.vala2
-rw-r--r--src/actions/keyAction.vala2
-rw-r--r--src/actions/pieAction.vala2
-rw-r--r--src/actions/sigAction.vala6
-rw-r--r--src/actions/uriAction.vala2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/actions/action.vala b/src/actions/action.vala
index 91fc448..1e6437e 100644
--- a/src/actions/action.vala
+++ b/src/actions/action.vala
@@ -71,7 +71,7 @@ public abstract class Action : GLib.Object {
/// This one is called, when the user activates the Slice.
/////////////////////////////////////////////////////////////////////
- public abstract void activate();
+ public abstract void activate(uint32 time_stamp);
}
}
diff --git a/src/actions/appAction.vala b/src/actions/appAction.vala
index 859baf8..e1ca3a2 100644
--- a/src/actions/appAction.vala
+++ b/src/actions/appAction.vala
@@ -63,7 +63,7 @@ public class AppAction : Action {
/// Launches the desired command.
/////////////////////////////////////////////////////////////////////
- public override void activate() {
+ public override void activate(uint32 time_stamp) {
try{
var item = GLib.AppInfo.create_from_commandline(this.real_command, null, GLib.AppInfoCreateFlags.NONE);
item.launch(null, null);
diff --git a/src/actions/keyAction.vala b/src/actions/keyAction.vala
index 68a2ec1..cbe8b6e 100644
--- a/src/actions/keyAction.vala
+++ b/src/actions/keyAction.vala
@@ -73,7 +73,7 @@ public class KeyAction : Action {
/// Presses the desired key.
/////////////////////////////////////////////////////////////////////
- public override void activate() {
+ public override void activate(uint32 time_stamp) {
key.press();
}
}
diff --git a/src/actions/pieAction.vala b/src/actions/pieAction.vala
index 8069ff3..931c9d3 100644
--- a/src/actions/pieAction.vala
+++ b/src/actions/pieAction.vala
@@ -95,7 +95,7 @@ public class PieAction : Action {
/// Opens the desired Pie.
/////////////////////////////////////////////////////////////////////
- public override void activate() {
+ public override void activate(uint32 time_stamp) {
PieManager.open_pie(real_command);
}
}
diff --git a/src/actions/sigAction.vala b/src/actions/sigAction.vala
index 4eebbca..bf9374d 100644
--- a/src/actions/sigAction.vala
+++ b/src/actions/sigAction.vala
@@ -29,7 +29,7 @@ public class SigAction : Action {
/// This signal is emitted on activation.
/////////////////////////////////////////////////////////////////////
- public signal void activated();
+ public signal void activated(uint32 time_stamp);
/////////////////////////////////////////////////////////////////////
/// This may store something useful.
@@ -55,8 +55,8 @@ public class SigAction : Action {
/// Emits the signal on activation.
/////////////////////////////////////////////////////////////////////
- public override void activate() {
- this.activated();
+ public override void activate(uint32 time_stamp) {
+ this.activated(time_stamp);
}
}
diff --git a/src/actions/uriAction.vala b/src/actions/uriAction.vala
index dfc1029..d0a41b8 100644
--- a/src/actions/uriAction.vala
+++ b/src/actions/uriAction.vala
@@ -65,7 +65,7 @@ public class UriAction : Action {
/// Opens the default application for the URI.
/////////////////////////////////////////////////////////////////////
- public override void activate() {
+ public override void activate(uint32 time_stamp) {
try{
GLib.AppInfo.launch_default_for_uri(real_command, null);
} catch (Error e) {