aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2013-10-29 17:16:45 -0700
committerLars Uebernickel <lars.uebernickel@canonical.com>2013-10-29 17:16:45 -0700
commit781447c5a0d82c625ddd8e6fb2ab01eae720d330 (patch)
treeec83b15f5491bf3a53209fb2a0cb99ab4d6b0926 /src
parentb9660509ac4306924e8d9cccb1728a8a459475a2 (diff)
downloadayatana-indicator-sound-781447c5a0d82c625ddd8e6fb2ab01eae720d330.tar.gz
ayatana-indicator-sound-781447c5a0d82c625ddd8e6fb2ab01eae720d330.tar.bz2
ayatana-indicator-sound-781447c5a0d82c625ddd8e6fb2ab01eae720d330.zip
Rename MediaPlayer.launch() ot activate()
Diffstat (limited to 'src')
-rw-r--r--src/media-player.vala8
-rw-r--r--src/service.vala2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/media-player.vala b/src/media-player.vala
index 7326708..7e0d2a7 100644
--- a/src/media-player.vala
+++ b/src/media-player.vala
@@ -118,17 +118,17 @@ public class MediaPlayer: Object {
}
/**
- * Launch the associated media player.
+ * Activate the associated media player.
*
* Note: this will _not_ call attach(), because it doesn't know on which dbus-name the player will appear.
* Use attach() to attach this object to a running instance of the player.
*/
- public void launch () {
+ public void activate () {
try {
this.appinfo.launch (null, null);
}
catch (Error e) {
- warning ("unable to launch %s: %s", appinfo.get_name (), e.message);
+ warning ("unable to activate %s: %s", appinfo.get_name (), e.message);
}
if (this.proxy == null)
@@ -144,7 +144,7 @@ public class MediaPlayer: Object {
}
else if (this.state != "Launching") {
this.play_when_attached = true;
- this.launch ();
+ this.activate ();
}
}
diff --git a/src/service.vala b/src/service.vala
index 7dc6824..9a82e8b 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -290,7 +290,7 @@ public class IndicatorSound.Service {
this.menus.@foreach ( (profile, menu) => menu.add_player (player));
SimpleAction action = new SimpleAction.stateful (player.id, null, this.action_state_for_player (player));
- action.activate.connect ( () => { player.launch (); });
+ action.activate.connect ( () => { player.activate (); });
this.actions.add_action (action);
var play_action = new SimpleAction.stateful ("play." + player.id, null, player.state);