diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-01-05 10:25:41 +0000 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-01-05 10:25:41 +0000 |
| commit | 057a66af1bb84160e6bb1181274b3ca4cfc36983 (patch) | |
| tree | f4e373753d8de0bf11944de2c9bf27a88612bfd4 /src/player-controller.vala | |
| parent | b18012476e2b586ff712d61272b6864479029e23 (diff) | |
| parent | 3e5682245ec0200831de249d6b625f3b4e21d91d (diff) | |
| download | ayatana-indicator-sound-057a66af1bb84160e6bb1181274b3ca4cfc36983.tar.gz ayatana-indicator-sound-057a66af1bb84160e6bb1181274b3ca4cfc36983.tar.bz2 ayatana-indicator-sound-057a66af1bb84160e6bb1181274b3ca4cfc36983.zip | |
merged app name in menu fix
Diffstat (limited to 'src/player-controller.vala')
| -rw-r--r-- | src/player-controller.vala | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/player-controller.vala b/src/player-controller.vala index 638c44d..58e3b47 100644 --- a/src/player-controller.vala +++ b/src/player-controller.vala @@ -44,7 +44,7 @@ public class PlayerController : GLib.Object public int current_state = state.OFFLINE; private Dbusmenu.Menuitem root_menu; - public string name { get; set;} + //public string name { get; set;} public string dbus_name { get; set;} public ArrayList<PlayerItem> custom_items; public Mpris2Controller mpris_bridge; @@ -62,7 +62,7 @@ public class PlayerController : GLib.Object this.root_menu = root; this.app_info = app; this.dbus_name = dbus_name; - this.name = format_player_name(this.app_info.get_name()); + //this.name = this.app_info.get_name(); this.icon_name = icon_name; this.custom_items = new ArrayList<PlayerItem>(); this.current_state = initial_state; @@ -74,7 +74,8 @@ public class PlayerController : GLib.Object public void update_state(state new_state) { - debug("update_state - player controller %s : new state %i", this.name, new_state); + debug("update_state - player controller %s : new state %i", this.app_info.get_name(), + new_state); this.current_state = new_state; this.update_layout(); } @@ -93,13 +94,14 @@ public class PlayerController : GLib.Object */ public void instantiate() { - debug("instantiate in player controller for %s", this.name); + debug("instantiate in player controller for %s", this.app_info.get_name() ); try{ this.app_info.launch(null, null); this.update_state(state.INSTANTIATING); } catch(GLib.Error error){ - warning("Failed to launch app %s with error message: %s", this.name, error.message); + warning("Failed to launch app %s with error message: %s", this.app_info.get_name(), + error.message ); } } @@ -181,6 +183,7 @@ public class PlayerController : GLib.Object } } } + private static string format_player_name(owned string app_info_name) { |