diff options
| -rw-r--r-- | src/gmenuharness/MenuItemMatcher.cpp | 2 | ||||
| -rw-r--r-- | src/info-notification.vala | 172 | ||||
| -rw-r--r-- | src/sound-menu.vala | 904 | ||||
| -rw-r--r-- | src/warn-notification.vala | 60 | ||||
| -rw-r--r-- | tests/indicator-test.cc | 112 | ||||
| -rw-r--r-- | tests/integration/indicator-sound-test-base.cpp | 16 | ||||
| -rw-r--r-- | tests/integration/test-indicator.cpp | 434 | ||||
| -rw-r--r-- | tests/notifications-mock.h | 252 | ||||
| -rw-r--r-- | tests/sound-menu.cc | 28 |
9 files changed, 990 insertions, 990 deletions
diff --git a/src/gmenuharness/MenuItemMatcher.cpp b/src/gmenuharness/MenuItemMatcher.cpp index f39acef..f2d5fe8 100644 --- a/src/gmenuharness/MenuItemMatcher.cpp +++ b/src/gmenuharness/MenuItemMatcher.cpp @@ -306,7 +306,7 @@ MenuItemMatcher& MenuItemMatcher::themed_icon(const std::string& iconName, const MenuItemMatcher& MenuItemMatcher::widget(const string& widget) { - return string_attribute("x-canonical-type", widget); + return string_attribute("x-ayatana-type", widget); } MenuItemMatcher& MenuItemMatcher::pass_through_attribute(const string& actionName, const shared_ptr<GVariant>& value) diff --git a/src/info-notification.vala b/src/info-notification.vala index 84987dc..e093aae 100644 --- a/src/info-notification.vala +++ b/src/info-notification.vala @@ -21,102 +21,102 @@ using Notify; public class IndicatorSound.InfoNotification: Notification { - protected override Notify.Notification create_notification () { - return new Notify.Notification (_("Volume"), "", "audio-volume-muted"); - } + protected override Notify.Notification create_notification () { + return new Notify.Notification (_("Volume"), "", "audio-volume-muted"); + } - public void show (VolumeControl.ActiveOutput active_output, - double volume, - bool is_high_volume) { - if (!notify_server_supports ("x-canonical-private-synchronous")) - return; + public void show (VolumeControl.ActiveOutput active_output, + double volume, + bool is_high_volume) { + if (!notify_server_supports ("x-canonical-private-synchronous")) + return; - /* Determine Label */ - unowned string volume_label = get_notification_label (active_output); + /* Determine Label */ + unowned string volume_label = get_notification_label (active_output); - /* Choose an icon */ - unowned string icon = get_volume_notification_icon (active_output, volume, is_high_volume); + /* Choose an icon */ + unowned string icon = get_volume_notification_icon (active_output, volume, is_high_volume); - /* Reset the notification */ - var n = _notification; - n.update (_("Volume"), volume_label, icon); - n.clear_hints(); - n.set_hint ("x-canonical-non-shaped-icon", "true"); - n.set_hint ("x-canonical-private-synchronous", "true"); - n.set_hint ("x-canonical-value-bar-tint", is_high_volume ? "true" : "false"); - n.set_hint ("value", ((int32)((volume * 100.0) + 0.5)).clamp(0, 100)); - show_notification (); - } + /* Reset the notification */ + var n = _notification; + n.update (_("Volume"), volume_label, icon); + n.clear_hints(); + n.set_hint ("x-canonical-non-shaped-icon", "true"); + n.set_hint ("x-canonical-private-synchronous", "true"); + n.set_hint ("x-canonical-value-bar-tint", is_high_volume ? "true" : "false"); + n.set_hint ("value", ((int32)((volume * 100.0) + 0.5)).clamp(0, 100)); + show_notification (); + } - private static unowned string get_notification_label (VolumeControl.ActiveOutput active_output) { + private static unowned string get_notification_label (VolumeControl.ActiveOutput active_output) { - switch (active_output) { - case VolumeControl.ActiveOutput.SPEAKERS: - return _("Speakers"); - case VolumeControl.ActiveOutput.HEADPHONES: - return _("Headphones"); - case VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES: - return _("Bluetooth headphones"); - case VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER: - return _("Bluetooth speaker"); - case VolumeControl.ActiveOutput.USB_SPEAKER: - return _("Usb speaker"); - case VolumeControl.ActiveOutput.USB_HEADPHONES: - return _("Usb headphones"); - case VolumeControl.ActiveOutput.HDMI_SPEAKER: - return _("HDMI speaker"); - case VolumeControl.ActiveOutput.HDMI_HEADPHONES: - return _("HDMI headphones"); - default: - return ""; - } - } + switch (active_output) { + case VolumeControl.ActiveOutput.SPEAKERS: + return _("Speakers"); + case VolumeControl.ActiveOutput.HEADPHONES: + return _("Headphones"); + case VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES: + return _("Bluetooth headphones"); + case VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER: + return _("Bluetooth speaker"); + case VolumeControl.ActiveOutput.USB_SPEAKER: + return _("Usb speaker"); + case VolumeControl.ActiveOutput.USB_HEADPHONES: + return _("Usb headphones"); + case VolumeControl.ActiveOutput.HDMI_SPEAKER: + return _("HDMI speaker"); + case VolumeControl.ActiveOutput.HDMI_HEADPHONES: + return _("HDMI headphones"); + default: + return ""; + } + } - private static unowned string get_volume_notification_icon (VolumeControl.ActiveOutput active_output, - double volume, - bool is_high_volume) { + private static unowned string get_volume_notification_icon (VolumeControl.ActiveOutput active_output, + double volume, + bool is_high_volume) { - if (!is_high_volume) - return get_volume_icon (active_output, volume); + if (!is_high_volume) + return get_volume_icon (active_output, volume); - switch (active_output) { - case VolumeControl.ActiveOutput.SPEAKERS: - case VolumeControl.ActiveOutput.HEADPHONES: - case VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES: - case VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER: - case VolumeControl.ActiveOutput.USB_SPEAKER: - case VolumeControl.ActiveOutput.USB_HEADPHONES: - case VolumeControl.ActiveOutput.HDMI_SPEAKER: - case VolumeControl.ActiveOutput.HDMI_HEADPHONES: - return "audio-volume-high"; + switch (active_output) { + case VolumeControl.ActiveOutput.SPEAKERS: + case VolumeControl.ActiveOutput.HEADPHONES: + case VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES: + case VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER: + case VolumeControl.ActiveOutput.USB_SPEAKER: + case VolumeControl.ActiveOutput.USB_HEADPHONES: + case VolumeControl.ActiveOutput.HDMI_SPEAKER: + case VolumeControl.ActiveOutput.HDMI_HEADPHONES: + return "audio-volume-high"; - default: - return ""; - } - } + default: + return ""; + } + } - private static unowned string get_volume_icon (VolumeControl.ActiveOutput active_output, - double volume) - { - switch (active_output) { - case VolumeControl.ActiveOutput.SPEAKERS: - case VolumeControl.ActiveOutput.HEADPHONES: - case VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES: - case VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER: - case VolumeControl.ActiveOutput.USB_SPEAKER: - case VolumeControl.ActiveOutput.USB_HEADPHONES: - case VolumeControl.ActiveOutput.HDMI_SPEAKER: - case VolumeControl.ActiveOutput.HDMI_HEADPHONES: - if (volume <= 0.0) - return "audio-volume-muted"; - if (volume <= 0.3) - return "audio-volume-low"; - if (volume <= 0.7) - return "audio-volume-medium"; - return "audio-volume-high"; + private static unowned string get_volume_icon (VolumeControl.ActiveOutput active_output, + double volume) + { + switch (active_output) { + case VolumeControl.ActiveOutput.SPEAKERS: + case VolumeControl.ActiveOutput.HEADPHONES: + case VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES: + case VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER: + case VolumeControl.ActiveOutput.USB_SPEAKER: + case VolumeControl.ActiveOutput.USB_HEADPHONES: + case VolumeControl.ActiveOutput.HDMI_SPEAKER: + case VolumeControl.ActiveOutput.HDMI_HEADPHONES: + if (volume <= 0.0) + return "audio-volume-muted"; + if (volume <= 0.3) + return "audio-volume-low"; + if (volume <= 0.7) + return "audio-volume-medium"; + return "audio-volume-high"; - default: - return ""; - } - } + default: + return ""; + } + } } diff --git a/src/sound-menu.vala b/src/sound-menu.vala index e0a05a1..957238c 100644 --- a/src/sound-menu.vala +++ b/src/sound-menu.vala @@ -19,456 +19,456 @@ public class SoundMenu: Object { - public enum DisplayFlags { - NONE = 0, - SHOW_MUTE = 1, - HIDE_INACTIVE_PLAYERS = 2, - HIDE_PLAYERS = 4, - GREETER_PLAYERS = 8, - SHOW_SILENT_MODE = 16, - HIDE_INACTIVE_PLAYERS_PLAY_CONTROLS = 32, - ADD_PLAY_CONTROL_INACTIVE_PLAYER = 64 - } - - public enum PlayerSectionPosition { - LABEL = 0, - PLAYER_CONTROLS = 1, - PLAYLIST = 2 - } - - const string PLAYBACK_ITEM_TYPE = "org.ayatana.unity.playback-item"; - - public SoundMenu (string? settings_action, DisplayFlags flags) { - /* A sound menu always has at least two sections: the volume section (this.volume_section) - * at the start of the menu, and the settings section at the end. Between those two, - * it has a dynamic amount of player sections, one for each registered player. - */ - - this.volume_section = new Menu (); - - if ((flags & DisplayFlags.SHOW_MUTE) != 0) - volume_section.append (_("Mute"), "indicator.mute"); - if ((flags & DisplayFlags.SHOW_SILENT_MODE) != 0) { - var item = new MenuItem(_("Silent Mode"), "indicator.silent-mode"); - item.set_attribute("x-canonical-type", "s", "org.ayatana.indicator.switch"); - volume_section.append_item(item); - } - - volume_section.append_item (this.create_slider_menu_item (_("Volume"), "indicator.volume(0)", 0.0, 1.0, 0.01, - "audio-volume-low-zero-panel", - "audio-volume-high-panel", true)); - - this.menu = new Menu (); - this.menu.append_section (null, volume_section); - - if (settings_action != null) { - settings_shown = true; - this.menu.append (_("Sound Settings…"), settings_action); - } - - var root_item = new MenuItem (null, "indicator.root"); - root_item.set_attribute ("x-canonical-type", "s", "org.ayatana.indicator.root"); - root_item.set_attribute ("x-canonical-scroll-action", "s", "indicator.scroll"); - root_item.set_attribute ("x-canonical-secondary-action", "s", "indicator.mute"); - root_item.set_attribute ("submenu-action", "s", "indicator.indicator-shown"); - root_item.set_submenu (this.menu); - - this.root = new Menu (); - root.append_item (root_item); - - this.hide_players = (flags & DisplayFlags.HIDE_PLAYERS) != 0; - this.hide_inactive = (flags & DisplayFlags.HIDE_INACTIVE_PLAYERS) != 0; - this.hide_inactive_player_controls = (flags & DisplayFlags.HIDE_INACTIVE_PLAYERS_PLAY_CONTROLS) != 0; - this.add_play_button_inactive_player = (flags & DisplayFlags.ADD_PLAY_CONTROL_INACTIVE_PLAYER) != 0; - this.notify_handlers = new HashTable<MediaPlayer, ulong> (direct_hash, direct_equal); - - this.greeter_players = (flags & DisplayFlags.GREETER_PLAYERS) != 0; - } - - ~SoundMenu () { - if (export_id != 0) { - bus.unexport_menu_model(export_id); - export_id = 0; - } - } - - public void set_default_player (string default_player_id) { - this.default_player = default_player_id; - foreach (var player_stored in notify_handlers.get_keys ()) { - int index = this.find_player_section(player_stored); - if (index != -1 && player_stored.id == this.default_player) { - add_player_playback_controls (player_stored, index, true); - } - } - } - - DBusConnection? bus = null; - uint export_id = 0; - - public void export (DBusConnection connection, string object_path) { - bus = connection; - try { - export_id = bus.export_menu_model (object_path, this.root); - } catch (Error e) { - critical ("%s", e.message); - } - } - - public bool show_mic_volume { - get { - return this.mic_volume_shown; - } - set { - if (value && !this.mic_volume_shown) { - var slider = this.create_slider_menu_item (_("Microphone Volume"), "indicator.mic-volume", 0.0, 1.0, 0.01, - "audio-input-microphone-low-zero-panel", - "audio-input-microphone-high-panel", false); - volume_section.append_item (slider); - this.mic_volume_shown = true; - } - else if (!value && this.mic_volume_shown) { - int location = -1; - while ((location = find_action(this.volume_section, "indicator.mic-volume")) != -1) { - this.volume_section.remove (location); - } - this.mic_volume_shown = false; - } - } - } - - public bool show_high_volume_warning { - get { - return this.high_volume_warning_shown; - } - set { - if (value && !this.high_volume_warning_shown) { - /* NOTE: Action doesn't really exist, just used to find below when removing */ - var item = new MenuItem(_("High volume can damage your hearing."), "indicator.high-volume-warning-item"); - volume_section.append_item (item); - this.high_volume_warning_shown = true; - } - else if (!value && this.high_volume_warning_shown) { - int location = -1; - while ((location = find_action(this.volume_section, "indicator.high-volume-warning-item")) != -1) { - this.volume_section.remove (location); - } - this.high_volume_warning_shown = false; - } - } - } - - int find_action (Menu menu, string in_action) { - int n = menu.get_n_items (); - for (int i = 0; i < n; i++) { - string action; - menu.get_item_attribute (i, "action", "s", out action); - if (in_action == action) - return i; - } - - return -1; - } - - public void update_all_players_play_section() { - foreach (var player_stored in notify_handlers.get_keys ()) { - int index = this.find_player_section(player_stored); - if (index != -1) { - // just update to verify if we must hide the player controls - update_player_section (player_stored, index); - } - } - } - - private void check_last_running_player () { - foreach (var player in notify_handlers.get_keys ()) { - if (player.is_running && number_of_running_players == 1) { - // this is the first or the last player running... - // store its id - this.last_player_updated (player.id); - } - } - } - - public void add_player (MediaPlayer player) { - if (this.notify_handlers.contains (player)) - return; - - if (player.is_running || !this.hide_inactive) - this.insert_player_section (player); - this.update_playlists (player); - - var handler_id = player.notify["is-running"].connect ( () => { - int index = this.find_player_section(player); - if (player.is_running) { - if (index == -1) { - this.insert_player_section (player); - } - number_of_running_players++; - } - else { - number_of_running_players--; - if (this.hide_inactive) - this.remove_player_section (player); - } - this.update_playlists (player); - - // we need to update the rest of players, because we might have - // a non running player still showing the playback controls - update_all_players_play_section(); - - check_last_running_player (); - }); - this.notify_handlers.insert (player, handler_id); - - player.playlists_changed.connect (this.update_playlists); - player.playbackstatus_changed.connect (this.update_playbackstatus); - - check_last_running_player (); - } - - public void remove_player (MediaPlayer player) { - this.remove_player_section (player); - - var id = this.notify_handlers.lookup(player); - if (id != 0) { - player.disconnect(id); - } - - player.playlists_changed.disconnect (this.update_playlists); - - /* this'll drop our ref to it */ - this.notify_handlers.remove (player); - - check_last_running_player (); - } - - public void update_volume_slider (VolumeControl.ActiveOutput active_output) { - int index = find_action (this.volume_section, "indicator.volume"); - if (index != -1) { - string label = "Volume"; - switch (active_output) { - case VolumeControl.ActiveOutput.SPEAKERS: - label = _("Volume"); - break; - case VolumeControl.ActiveOutput.HEADPHONES: - label = _("Volume (Headphones)"); - break; - case VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER: - label = _("Volume (Bluetooth)"); - break; - case VolumeControl.ActiveOutput.USB_SPEAKER: - label = _("Volume (Usb)"); - break; - case VolumeControl.ActiveOutput.HDMI_SPEAKER: - label = _("Volume (HDMI)"); - break; - case VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES: - label = _("Volume (Bluetooth headphones)"); - break; - case VolumeControl.ActiveOutput.USB_HEADPHONES: - label = _("Volume (Usb headphones)"); - break; - case VolumeControl.ActiveOutput.HDMI_HEADPHONES: - label = _("Volume (HDMI headphones)"); - break; - } - this.volume_section.remove (index); - this.volume_section.insert_item (index, this.create_slider_menu_item (_(label), "indicator.volume(0)", 0.0, 1.0, 0.01, - "audio-volume-low-zero-panel", - "audio-volume-high-panel", true)); - } - } - - public Menu root; - public Menu menu; - Menu volume_section; - bool mic_volume_shown; - bool settings_shown = false; - bool high_volume_warning_shown = false; - bool hide_inactive; - bool hide_players = false; - bool hide_inactive_player_controls = false; - bool add_play_button_inactive_player = false; - HashTable<MediaPlayer, ulong> notify_handlers; - bool greeter_players = false; - int number_of_running_players = 0; - string default_player = ""; - - /* returns the position in this.menu of the section that's associated with @player */ - int find_player_section (MediaPlayer player) { - debug("Looking for player: %s", player.id); - string action_name = @"indicator.$(player.id)"; - int n = this.menu.get_n_items (); - for (int i = 0; i < n; i++) { - var section = this.menu.get_item_link (i, Menu.LINK_SECTION); - if (section == null) continue; - - string action; - section.get_item_attribute (0, "action", "s", out action); - if (action == action_name) - return i; - } - - debug("Unable to find section for player: %s", player.id); - return -1; - } - - int find_player_playback_controls_section (Menu player_menu) { - int n = player_menu.get_n_items (); - for (int i = 0; i < n; i++) { - string type; - player_menu.get_item_attribute (i, "x-canonical-type", "s", out type); - if (type == PLAYBACK_ITEM_TYPE) - return i; - } - - return -1; - } - - MenuItem create_playback_menu_item (MediaPlayer player) { - var playback_item = new MenuItem (null, null); - playback_item.set_attribute ("x-canonical-type", "s", PLAYBACK_ITEM_TYPE); - if (player.is_running) { - if (player.can_do_play) { - playback_item.set_attribute ("x-canonical-play-action", "s", "indicator.play." + player.id); - } - if (player.can_do_next) { - playback_item.set_attribute ("x-canonical-next-action", "s", "indicator.next." + player.id); - } - if (player.can_do_prev) { - playback_item.set_attribute ("x-canonical-previous-action", "s", "indicator.previous." + player.id); - } - } else { - if (this.add_play_button_inactive_player) { - playback_item.set_attribute ("x-canonical-play-action", "s", "indicator.play." + player.id); - } - } - return playback_item; - } - - void insert_player_section (MediaPlayer player) { - if (this.hide_players) - return; - - var section = new Menu (); - Icon icon; - - debug("Adding section for player: %s (%s)", player.id, player.is_running ? "running" : "not running"); - - icon = player.icon; - if (icon == null) - icon = new ThemedIcon.with_default_fallbacks ("application-default-icon"); - - var base_action = "indicator." + player.id; - if (this.greeter_players) - base_action += ".greeter"; - - var player_item = new MenuItem (player.name, base_action); - player_item.set_attribute ("x-canonical-type", "s", "org.ayatana.unity.media-player"); - if (icon != null) - player_item.set_attribute_value ("icon", icon.serialize ()); - section.append_item (player_item); - - if (player.is_running|| !this.hide_inactive_player_controls || player.id == this.default_player) { - var playback_item = create_playback_menu_item (player); - section.insert_item (PlayerSectionPosition.PLAYER_CONTROLS, playback_item); - } - - /* Add new players to the end of the player sections, just before the settings */ - if (settings_shown) { - this.menu.insert_section (this.menu.get_n_items () -1, null, section); - } else { - this.menu.append_section (null, section); - } - } - - void remove_player_section (MediaPlayer player) { - if (this.hide_players) - return; - - int index = this.find_player_section (player); - if (index >= 0) - this.menu.remove (index); - } - - void add_player_playback_controls (MediaPlayer player, int index, bool adding_default_player) { - var player_section = this.menu.get_item_link(index, Menu.LINK_SECTION) as Menu; - - int play_control_index = find_player_playback_controls_section (player_section); - if (player.is_running || !this.hide_inactive_player_controls || (number_of_running_players == 0 && adding_default_player) ) { - MenuItem playback_item = create_playback_menu_item (player); - if (play_control_index != -1) { - player_section.remove (PlayerSectionPosition.PLAYER_CONTROLS); - } - player_section.insert_item (PlayerSectionPosition.PLAYER_CONTROLS, playback_item); - } else { - if (play_control_index != -1 && number_of_running_players >= 1) { - // remove both, playlist and play controls - player_section.remove (PlayerSectionPosition.PLAYLIST); - player_section.remove (PlayerSectionPosition.PLAYER_CONTROLS); - } - } - } - - void update_player_section (MediaPlayer player, int index) { - add_player_playback_controls (player, index, false); - } - - void update_playlists (MediaPlayer player) { - int index = find_player_section (player); - if (index < 0) - return; - - var player_section = this.menu.get_item_link (index, Menu.LINK_SECTION) as Menu; - - /* if a section has three items, the playlists menu is in it */ - if (player_section.get_n_items () == 3) - player_section.remove (2); - - if (!player.is_running) - return; - - var count = player.get_n_playlists (); - if (count == 0) - return; - - var playlists_section = new Menu (); - for (int i = 0; i < count; i++) { - var playlist_id = player.get_playlist_id (i); - playlists_section.append (player.get_playlist_name (i), - @"indicator.play-playlist.$(player.id)::$playlist_id"); - - } - - var submenu = new Menu (); - submenu.append_section (null, playlists_section); - player_section.append_submenu (_("Choose Playlist"), submenu); - } - - void update_playbackstatus (MediaPlayer player) { - int index = find_player_section (player); - if (index != -1) { - update_player_section (player, index); - } - } - - MenuItem create_slider_menu_item (string label, string action, double min, double max, double step, string min_icon_name, string max_icon_name, bool sync_action) { - var min_icon = new ThemedIcon.with_default_fallbacks (min_icon_name); - var max_icon = new ThemedIcon.with_default_fallbacks (max_icon_name); - - var slider = new MenuItem (label, action); - slider.set_attribute ("x-canonical-type", "s", "org.ayatana.unity.slider"); - slider.set_attribute_value ("min-icon", min_icon.serialize ()); - slider.set_attribute_value ("max-icon", max_icon.serialize ()); - slider.set_attribute ("min-value", "d", min); - slider.set_attribute ("max-value", "d", max); - slider.set_attribute ("step", "d", step); - if (sync_action) { - slider.set_attribute ("x-canonical-sync-action", "s", "indicator.volume-sync"); - } - - return slider; - } - - public signal void last_player_updated (string player_id); + public enum DisplayFlags { + NONE = 0, + SHOW_MUTE = 1, + HIDE_INACTIVE_PLAYERS = 2, + HIDE_PLAYERS = 4, + GREETER_PLAYERS = 8, + SHOW_SILENT_MODE = 16, + HIDE_INACTIVE_PLAYERS_PLAY_CONTROLS = 32, + ADD_PLAY_CONTROL_INACTIVE_PLAYER = 64 + } + + public enum PlayerSectionPosition { + LABEL = 0, + PLAYER_CONTROLS = 1, + PLAYLIST = 2 + } + + const string PLAYBACK_ITEM_TYPE = "org.ayatana.unity.playback-item"; + + public SoundMenu (string? settings_action, DisplayFlags flags) { + /* A sound menu always has at least two sections: the volume section (this.volume_section) + * at the start of the menu, and the settings section at the end. Between those two, + * it has a dynamic amount of player sections, one for each registered player. + */ + + this.volume_section = new Menu (); + + if ((flags & DisplayFlags.SHOW_MUTE) != 0) + volume_section.append (_("Mute"), "indicator.mute"); + if ((flags & DisplayFlags.SHOW_SILENT_MODE) != 0) { + var item = new MenuItem(_("Silent Mode"), "indicator.silent-mode"); + item.set_attribute("x-ayatana-type", "s", "org.ayatana.indicator.switch"); + volume_section.append_item(item); + } + + volume_section.append_item (this.create_slider_menu_item (_("Volume"), "indicator.volume(0)", 0.0, 1.0, 0.01, + "audio-volume-low-zero-panel", + "audio-volume-high-panel", true)); + + this.menu = new Menu (); + this.menu.append_section (null, volume_section); + + if (settings_action != null) { + settings_shown = true; + this.menu.append (_("Sound Settings…"), settings_action); + } + + var root_item = new MenuItem (null, "indicator.root"); + root_item.set_attribute ("x-ayatana-type", "s", "org.ayatana.indicator.root"); + root_item.set_attribute ("x-ayatana-scroll-action", "s", "indicator.scroll"); + root_item.set_attribute ("x-ayatana-secondary-action", "s", "indicator.mute"); + root_item.set_attribute ("submenu-action", "s", "indicator.indicator-shown"); + root_item.set_submenu (this.menu); + + this.root = new Menu (); + root.append_item (root_item); + + this.hide_players = (flags & DisplayFlags.HIDE_PLAYERS) != 0; + this.hide_inactive = (flags & DisplayFlags.HIDE_INACTIVE_PLAYERS) != 0; + this.hide_inactive_player_controls = (flags & DisplayFlags.HIDE_INACTIVE_PLAYERS_PLAY_CONTROLS) != 0; + this.add_play_button_inactive_player = (flags & DisplayFlags.ADD_PLAY_CONTROL_INACTIVE_PLAYER) != 0; + this.notify_handlers = new HashTable<MediaPlayer, ulong> (direct_hash, direct_equal); + + this.greeter_players = (flags & DisplayFlags.GREETER_PLAYERS) != 0; + } + + ~SoundMenu () { + if (export_id != 0) { + bus.unexport_menu_model(export_id); + export_id = 0; + } + } + + public void set_default_player (string default_player_id) { + this.default_player = default_player_id; + foreach (var player_stored in notify_handlers.get_keys ()) { + int index = this.find_player_section(player_stored); + if (index != -1 && player_stored.id == this.default_player) { + add_player_playback_controls (player_stored, index, true); + } + } + } + + DBusConnection? bus = null; + uint export_id = 0; + + public void export (DBusConnection connection, string object_path) { + bus = connection; + try { + export_id = bus.export_menu_model (object_path, this.root); + } catch (Error e) { + critical ("%s", e.message); + } + } + + public bool show_mic_volume { + get { + return this.mic_volume_shown; + } + set { + if (value && !this.mic_volume_shown) { + var slider = this.create_slider_menu_item (_("Microphone Volume"), "indicator.mic-volume", 0.0, 1.0, 0.01, + "audio-input-microphone-low-zero-panel", + "audio-input-microphone-high-panel", false); + volume_section.append_item (slider); + this.mic_volume_shown = true; + } + else if (!value && this.mic_volume_shown) { + int location = -1; + while ((location = find_action(this.volume_section, "indicator.mic-volume")) != -1) { + this.volume_section.remove (location); + } + this.mic_volume_shown = false; + } + } + } + + public bool show_high_volume_warning { + get { + return this.high_volume_warning_shown; + } + set { + if (value && !this.high_volume_warning_shown) { + /* NOTE: Action doesn't really exist, just used to find below when removing */ + var item = new MenuItem(_("High volume can damage your hearing."), "indicator.high-volume-warning-item"); + volume_section.append_item (item); + this.high_volume_warning_shown = true; + } + else if (!value && this.high_volume_warning_shown) { + int location = -1; + while ((location = find_action(this.volume_section, "indicator.high-volume-warning-item")) != -1) { + this.volume_section.remove (location); + } + this.high_volume_warning_shown = false; + } + } + } + + int find_action (Menu menu, string in_action) { + int n = menu.get_n_items (); + for (int i = 0; i < n; i++) { + string action; + menu.get_item_attribute (i, "action", "s", out action); + if (in_action == action) + return i; + } + + return -1; + } + + public void update_all_players_play_section() { + foreach (var player_stored in notify_handlers.get_keys ()) { + int index = this.find_player_section(player_stored); + if (index != -1) { + // just update to verify if we must hide the player controls + update_player_section (player_stored, index); + } + } + } + + private void check_last_running_player () { + foreach (var player in notify_handlers.get_keys ()) { + if (player.is_running && number_of_running_players == 1) { + // this is the first or the last player running... + // store its id + this.last_player_updated (player.id); + } + } + } + + public void add_player (MediaPlayer player) { + if (this.notify_handlers.contains (player)) + return; + + if (player.is_running || !this.hide_inactive) + this.insert_player_section (player); + this.update_playlists (player); + + var handler_id = player.notify["is-running"].connect ( () => { + int index = this.find_player_section(player); + if (player.is_running) { + if (index == -1) { + this.insert_player_section (player); + } + number_of_running_players++; + } + else { + number_of_running_players--; + if (this.hide_inactive) + this.remove_player_section (player); + } + this.update_playlists (player); + + // we need to update the rest of players, because we might have + // a non running player still showing the playback controls + update_all_players_play_section(); + + check_last_running_player (); + }); + this.notify_handlers.insert (player, handler_id); + + player.playlists_changed.connect (this.update_playlists); + player.playbackstatus_changed.connect (this.update_playbackstatus); + + check_last_running_player (); + } + + public void remove_player (MediaPlayer player) { + this.remove_player_section (player); + + var id = this.notify_handlers.lookup(player); + if (id != 0) { + player.disconnect(id); + } + + player.playlists_changed.disconnect (this.update_playlists); + + /* this'll drop our ref to it */ + this.notify_handlers.remove (player); + + check_last_running_player (); + } + + public void update_volume_slider (VolumeControl.ActiveOutput active_output) { + int index = find_action (this.volume_section, "indicator.volume"); + if (index != -1) { + string label = "Volume"; + switch (active_output) { + case VolumeControl.ActiveOutput.SPEAKERS: + label = _("Volume"); + break; + case VolumeControl.ActiveOutput.HEADPHONES: + label = _("Volume (Headphones)"); + break; + case VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER: + label = _("Volume (Bluetooth)"); + break; + case VolumeControl.ActiveOutput.USB_SPEAKER: + label = _("Volume (Usb)"); + break; + case VolumeControl.ActiveOutput.HDMI_SPEAKER: + label = _("Volume (HDMI)"); + break; + case VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES: + label = _("Volume (Bluetooth headphones)"); + break; + case VolumeControl.ActiveOutput.USB_HEADPHONES: + label = _("Volume (Usb headphones)"); + break; + case VolumeControl.ActiveOutput.HDMI_HEADPHONES: + label = _("Volume (HDMI headphones)"); + break; + } + this.volume_section.remove (index); + this.volume_section.insert_item (index, this.create_slider_menu_item (_(label), "indicator.volume(0)", 0.0, 1.0, 0.01, + "audio-volume-low-zero-panel", + "audio-volume-high-panel", true)); + } + } + + public Menu root; + public Menu menu; + Menu volume_section; + bool mic_volume_shown; + bool settings_shown = false; + bool high_volume_warning_shown = false; + bool hide_inactive; + bool hide_players = false; + bool hide_inactive_player_controls = false; + bool add_play_button_inactive_player = false; + HashTable<MediaPlayer, ulong> notify_handlers; + bool greeter_players = false; + int number_of_running_players = 0; + string default_player = ""; + + /* returns the position in this.menu of the section that's associated with @player */ + int find_player_section (MediaPlayer player) { + debug("Looking for player: %s", player.id); + string action_name = @"indicator.$(player.id)"; + int n = this.menu.get_n_items (); + for (int i = 0; i < n; i++) { + var section = this.menu.get_item_link (i, Menu.LINK_SECTION); + if (section == null) continue; + + string action; + section.get_item_attribute (0, "action", "s", out action); + if (action == action_name) + return i; + } + + debug("Unable to find section for player: %s", player.id); + return -1; + } + + int find_player_playback_controls_section (Menu player_menu) { + int n = player_menu.get_n_items (); + for (int i = 0; i < n; i++) { + string type; + player_menu.get_item_attribute (i, "x-ayatana-type", "s", out type); + if (type == PLAYBACK_ITEM_TYPE) + return i; + } + + return -1; + } + + MenuItem create_playback_menu_item (MediaPlayer player) { + var playback_item = new MenuItem (null, null); + playback_item.set_attribute ("x-ayatana-type", "s", PLAYBACK_ITEM_TYPE); + if (player.is_running) { + if (player.can_do_play) { + playback_item.set_attribute ("x-ayatana-play-action", "s", "indicator.play." + player.id); + } + if (player.can_do_next) { + playback_item.set_attribute ("x-ayatana-next-action", "s", "indicator.next." + player.id); + } + if (player.can_do_prev) { + playback_item.set_attribute ("x-ayatana-previous-action", "s", "indicator.previous." + player.id); + } + } else { + if (this.add_play_button_inactive_player) { + playback_item.set_attribute ("x-ayatana-play-action", "s", "indicator.play." + player.id); + } + } + return playback_item; + } + + void insert_player_section (MediaPlayer player) { + if (this.hide_players) + return; + + var section = new Menu (); + Icon icon; + + debug("Adding section for player: %s (%s)", player.id, player.is_running ? "running" : "not running"); + + icon = player.icon; + if (icon == null) + icon = new ThemedIcon.with_default_fallbacks ("application-default-icon"); + + var base_action = "indicator." + player.id; + if (this.greeter_players) + base_action += ".greeter"; + + var player_item = new MenuItem (player.name, base_action); + player_item.set_attribute ("x-ayatana-type", "s", "org.ayatana.unity.media-player"); + if (icon != null) + player_item.set_attribute_value ("icon", icon.serialize ()); + section.append_item (player_item); + + if (player.is_running|| !this.hide_inactive_player_controls || player.id == this.default_player) { + var playback_item = create_playback_menu_item (player); + section.insert_item (PlayerSectionPosition.PLAYER_CONTROLS, playback_item); + } + + /* Add new players to the end of the player sections, just before the settings */ + if (settings_shown) { + this.menu.insert_section (this.menu.get_n_items () -1, null, section); + } else { + this.menu.append_section (null, section); + } + } + + void remove_player_section (MediaPlayer player) { + if (this.hide_players) + return; + + int index = this.find_player_section (player); + if (index >= 0) + this.menu.remove (index); + } + + void add_player_playback_controls (MediaPlayer player, int index, bool adding_default_player) { + var player_section = this.menu.get_item_link(index, Menu.LINK_SECTION) as Menu; + + int play_control_index = find_player_playback_controls_section (player_section); + if (player.is_running || !this.hide_inactive_player_controls || (number_of_running_players == 0 && adding_default_player) ) { + MenuItem playback_item = create_playback_menu_item (player); + if (play_control_index != -1) { + player_section.remove (PlayerSectionPosition.PLAYER_CONTROLS); + } + player_section.insert_item (PlayerSectionPosition.PLAYER_CONTROLS, playback_item); + } else { + if (play_control_index != -1 && number_of_running_players >= 1) { + // remove both, playlist and play controls + player_section.remove (PlayerSectionPosition.PLAYLIST); + player_section.remove (PlayerSectionPosition.PLAYER_CONTROLS); + } + } + } + + void update_player_section (MediaPlayer player, int index) { + add_player_playback_controls (player, index, false); + } + + void update_playlists (MediaPlayer player) { + int index = find_player_section (player); + if (index < 0) + return; + + var player_section = this.menu.get_item_link (index, Menu.LINK_SECTION) as Menu; + + /* if a section has three items, the playlists menu is in it */ + if (player_section.get_n_items () == 3) + player_section.remove (2); + + if (!player.is_running) + return; + + var count = player.get_n_playlists (); + if (count == 0) + return; + + var playlists_section = new Menu (); + for (int i = 0; i < count; i++) { + var playlist_id = player.get_playlist_id (i); + playlists_section.append (player.get_playlist_name (i), + @"indicator.play-playlist.$(player.id)::$playlist_id"); + + } + + var submenu = new Menu (); + submenu.append_section (null, playlists_section); + player_section.append_submenu (_("Choose Playlist"), submenu); + } + + void update_playbackstatus (MediaPlayer player) { + int index = find_player_section (player); + if (index != -1) { + update_player_section (player, index); + } + } + + MenuItem create_slider_menu_item (string label, string action, double min, double max, double step, string min_icon_name, string max_icon_name, bool sync_action) { + var min_icon = new ThemedIcon.with_default_fallbacks (min_icon_name); + var max_icon = new ThemedIcon.with_default_fallbacks (max_icon_name); + + var slider = new MenuItem (label, action); + slider.set_attribute ("x-ayatana-type", "s", "org.ayatana.unity.slider"); + slider.set_attribute_value ("min-icon", min_icon.serialize ()); + slider.set_attribute_value ("max-icon", max_icon.serialize ()); + slider.set_attribute ("min-value", "d", min); + slider.set_attribute ("max-value", "d", max); + slider.set_attribute ("step", "d", step); + if (sync_action) { + slider.set_attribute ("x-ayatana-sync-action", "s", "indicator.volume-sync"); + } + + return slider; + } + + public signal void last_player_updated (string player_id); } diff --git a/src/warn-notification.vala b/src/warn-notification.vala index 17129aa..f5c8b0b 100644 --- a/src/warn-notification.vala +++ b/src/warn-notification.vala @@ -19,41 +19,41 @@ public class IndicatorSound.WarnNotification: Notification { - public enum Response { - CANCEL, - OK - } + public enum Response { + CANCEL, + OK + } - public signal void user_responded (Response response); + public signal void user_responded (Response response); protected override Notify.Notification create_notification () { - var n = new Notify.Notification ( - _("Volume"), - _("High volume can damage your hearing."), - "audio-volume-high"); - n.set_hint ("x-canonical-non-shaped-icon", "true"); - n.set_hint ("x-canonical-snap-decisions", "true"); - n.set_hint ("x-canonical-private-affirmative-tint", "true"); - n.closed.connect ((n) => { - n.clear_actions (); - }); - return n; - } + var n = new Notify.Notification ( + _("Volume"), + _("High volume can damage your hearing."), + "audio-volume-high"); + n.set_hint ("x-canonical-non-shaped-icon", "true"); + n.set_hint ("x-canonical-snap-decisions", "true"); + n.set_hint ("x-canonical-private-affirmative-tint", "true"); + n.closed.connect ((n) => { + n.clear_actions (); + }); + return n; + } - public bool show () { + public bool show () { - if (!notify_server_supports ("actions")) - return false; + if (!notify_server_supports ("actions")) + return false; - _notification.clear_actions (); - _notification.add_action ("ok", _("OK"), (n, a) => { - user_responded (Response.OK); - }); - _notification.add_action ("cancel", _("Cancel"), (n, a) => { - user_responded (Response.CANCEL); - }); - show_notification(); + _notification.clear_actions (); + _notification.add_action ("ok", _("OK"), (n, a) => { + user_responded (Response.OK); + }); + _notification.add_action ("cancel", _("Cancel"), (n, a) => { + user_responded (Response.CANCEL); + }); + show_notification(); - return true; - } + return true; + } } diff --git a/tests/indicator-test.cc b/tests/indicator-test.cc index faa42d0..904cb52 100644 --- a/tests/indicator-test.cc +++ b/tests/indicator-test.cc @@ -27,92 +27,92 @@ class IndicatorTest : public IndicatorFixture { protected: - IndicatorTest (void) : - IndicatorFixture(INDICATOR_SOUND_SERVICE_BINARY, "org.ayatana.indicator.sound") - { - } + IndicatorTest (void) : + IndicatorFixture(INDICATOR_SOUND_SERVICE_BINARY, "org.ayatana.indicator.sound") + { + } - std::shared_ptr<AccountsServiceMock> as; - std::shared_ptr<NotificationsMock> notification; + std::shared_ptr<AccountsServiceMock> as; + std::shared_ptr<NotificationsMock> notification; - virtual void SetUp() override - { - //addMock(buildBustleMock("indicator-test-session.bustle", DBUS_TEST_SERVICE_BUS_SESSION)); - //addMock(buildBustleMock("indicator-test-system.bustle", DBUS_TEST_SERVICE_BUS_SYSTEM)); - g_setenv("LD_PRELOAD", PA_MOCK_LIB, TRUE); + virtual void SetUp() override + { + //addMock(buildBustleMock("indicator-test-session.bustle", DBUS_TEST_SERVICE_BUS_SESSION)); + //addMock(buildBustleMock("indicator-test-system.bustle", DBUS_TEST_SERVICE_BUS_SYSTEM)); + g_setenv("LD_PRELOAD", PA_MOCK_LIB, TRUE); - g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE); - g_setenv("GSETTINGS_BACKEND", "memory", TRUE); + g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE); + g_setenv("GSETTINGS_BACKEND", "memory", TRUE); - as = std::make_shared<AccountsServiceMock>(); - addMock(*as); + as = std::make_shared<AccountsServiceMock>(); + addMock(*as); - notification = std::make_shared<NotificationsMock>(); - addMock(*notification); + notification = std::make_shared<NotificationsMock>(); + addMock(*notification); - IndicatorFixture::SetUp(); - } + IndicatorFixture::SetUp(); + } - virtual void TearDown() override - { - as.reset(); - notification.reset(); + virtual void TearDown() override + { + as.reset(); + notification.reset(); - IndicatorFixture::TearDown(); - } + IndicatorFixture::TearDown(); + } }; TEST_F(IndicatorTest, PhoneMenu) { - setMenu("/org/ayatana/indicator/sound/phone"); + setMenu("/org/ayatana/indicator/sound/phone"); - EXPECT_EVENTUALLY_MENU_ATTRIB(std::vector<int>({0}), "action", "indicator.root"); - EXPECT_MENU_ATTRIB({0}, "x-canonical-type", "org.ayatana.indicator.root"); - EXPECT_MENU_ATTRIB({0}, "x-canonical-scroll-action", "indicator.scroll"); - EXPECT_MENU_ATTRIB({0}, "x-canonical-secondary-action", "indicator.mute"); + EXPECT_EVENTUALLY_MENU_ATTRIB(std::vector<int>({0}), "action", "indicator.root"); + EXPECT_MENU_ATTRIB({0}, "x-ayatana-type", "org.ayatana.indicator.root"); + EXPECT_MENU_ATTRIB({0}, "x-ayatana-scroll-action", "indicator.scroll"); + EXPECT_MENU_ATTRIB({0}, "x-ayatana-secondary-action", "indicator.mute"); - EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "action", "indicator.silent-mode"); - EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "label", "Silent Mode"); + EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "action", "indicator.silent-mode"); + EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "label", "Silent Mode"); - EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "action", "indicator.phone-settings"); - EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "label", "Sound Settings…"); + EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "action", "indicator.phone-settings"); + EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "label", "Sound Settings…"); } TEST_F(IndicatorTest, DesktopMenu) { - setMenu("/org/ayatana/indicator/sound/desktop"); + setMenu("/org/ayatana/indicator/sound/desktop"); - EXPECT_MENU_ATTRIB({0}, "action", "indicator.root"); - EXPECT_MENU_ATTRIB({0}, "x-canonical-type", "org.ayatana.indicator.root"); - EXPECT_MENU_ATTRIB({0}, "x-canonical-scroll-action", "indicator.scroll"); - EXPECT_MENU_ATTRIB({0}, "x-canonical-secondary-action", "indicator.mute"); + EXPECT_MENU_ATTRIB({0}, "action", "indicator.root"); + EXPECT_MENU_ATTRIB({0}, "x-ayatana-type", "org.ayatana.indicator.root"); + EXPECT_MENU_ATTRIB({0}, "x-ayatana-scroll-action", "indicator.scroll"); + EXPECT_MENU_ATTRIB({0}, "x-ayatana-secondary-action", "indicator.mute"); - EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "action", "indicator.mute"); - EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "label", "Mute"); + EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "action", "indicator.mute"); + EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "label", "Mute"); - EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "action", "indicator.desktop-settings"); - EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "label", "Sound Settings…"); + EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "action", "indicator.desktop-settings"); + EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "label", "Sound Settings…"); } TEST_F(IndicatorTest, BaseActions) { - setActions("/org/ayatana/indicator/sound"); + setActions("/org/ayatana/indicator/sound"); - ASSERT_ACTION_EXISTS("root"); - ASSERT_ACTION_STATE_TYPE("root", G_VARIANT_TYPE("a{sv}")); + ASSERT_ACTION_EXISTS("root"); + ASSERT_ACTION_STATE_TYPE("root", G_VARIANT_TYPE("a{sv}")); - ASSERT_ACTION_EXISTS("scroll"); + ASSERT_ACTION_EXISTS("scroll"); - ASSERT_ACTION_EXISTS("silent-mode"); - ASSERT_ACTION_STATE_TYPE("silent-mode", G_VARIANT_TYPE_BOOLEAN); - EXPECT_ACTION_STATE("silent-mode", false); + ASSERT_ACTION_EXISTS("silent-mode"); + ASSERT_ACTION_STATE_TYPE("silent-mode", G_VARIANT_TYPE_BOOLEAN); + EXPECT_ACTION_STATE("silent-mode", false); - ASSERT_ACTION_EXISTS("mute"); - ASSERT_ACTION_STATE_TYPE("mute", G_VARIANT_TYPE_BOOLEAN); + ASSERT_ACTION_EXISTS("mute"); + ASSERT_ACTION_STATE_TYPE("mute", G_VARIANT_TYPE_BOOLEAN); - ASSERT_ACTION_EXISTS("mic-volume"); - ASSERT_ACTION_STATE_TYPE("mic-volume", G_VARIANT_TYPE_DOUBLE); + ASSERT_ACTION_EXISTS("mic-volume"); + ASSERT_ACTION_STATE_TYPE("mic-volume", G_VARIANT_TYPE_DOUBLE); - ASSERT_ACTION_EXISTS("volume"); - ASSERT_ACTION_STATE_TYPE("volume", G_VARIANT_TYPE_DOUBLE); + ASSERT_ACTION_EXISTS("volume"); + ASSERT_ACTION_STATE_TYPE("volume", G_VARIANT_TYPE_DOUBLE); } diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index 2eed807..b7a0a77 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -419,7 +419,7 @@ unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::volumeSlider(double .double_attribute("min-value", 0.0) .double_attribute("max-value", 1.0) .double_attribute("step", 0.01) - .string_attribute("x-canonical-type", "org.ayatana.unity.slider") + .string_attribute("x-ayatana-type", "org.ayatana.unity.slider") .themed_icon("max-icon", {"audio-volume-high-panel", "audio-volume-high", "audio-volume", "audio"}) .themed_icon("min-icon", {"audio-volume-low-zero-panel", "audio-volume-low-zero", "audio-volume-low", "audio-volume", "audio"}) .pass_through_double_attribute("action", volume); @@ -433,7 +433,7 @@ unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::micSlider(double vo .double_attribute("min-value", 0.0) .double_attribute("max-value", 1.0) .double_attribute("step", 0.01) - .string_attribute("x-canonical-type", "org.ayatana.unity.slider") + .string_attribute("x-ayatana-type", "org.ayatana.unity.slider") .themed_icon("max-icon", {"audio-input-microphone-high-panel", "audio-input-microphone-high", "audio-input-microphone", "audio-input", "audio"}) .themed_icon("min-icon", {"audio-input-microphone-low-zero-panel", "audio-input-microphone-low-zero", "audio-input-microphone-low", "audio-input-microphone", "audio-input", "audio"}) .pass_through_double_attribute("action", volume); @@ -923,9 +923,9 @@ void IndicatorSoundTestBase::checkPortDevicesLabels(DevicePortType speakerPort, EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::starts_with) .submenu() @@ -948,9 +948,9 @@ void IndicatorSoundTestBase::checkPortDevicesLabels(DevicePortType speakerPort, EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::starts_with) .submenu() diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp index 5e74636..36b299e 100644 --- a/tests/integration/test-indicator.cpp +++ b/tests/integration/test-indicator.cpp @@ -51,9 +51,9 @@ TEST_F(TestIndicator, PhoneCheckRootIcon) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::all) .submenu() @@ -111,9 +111,9 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::all) .submenu() @@ -134,9 +134,9 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::all) .submenu() @@ -160,9 +160,9 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::all) .submenu() @@ -196,8 +196,8 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -217,8 +217,8 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -239,8 +239,8 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -301,9 +301,9 @@ TEST_F(TestIndicator, PhoneChangeRoleVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::starts_with) .submenu() @@ -318,8 +318,8 @@ TEST_F(TestIndicator, PhoneChangeRoleVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::ends_with) .submenu() .item(mh::MenuItemMatcher() @@ -343,9 +343,9 @@ TEST_F(TestIndicator, PhoneChangeRoleVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::starts_with) .submenu() @@ -360,8 +360,8 @@ TEST_F(TestIndicator, PhoneChangeRoleVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::ends_with) .submenu() .item(mh::MenuItemMatcher() @@ -388,9 +388,9 @@ TEST_F(TestIndicator, PhoneBasicInitialVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::all) .submenu() @@ -423,9 +423,9 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::all) .submenu() @@ -453,9 +453,9 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::all) .submenu() @@ -470,13 +470,13 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -507,8 +507,8 @@ TEST_F(TestIndicator, DesktopBasicInitialVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -524,13 +524,13 @@ TEST_F(TestIndicator, DesktopBasicInitialVolume) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -561,8 +561,8 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -578,13 +578,13 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -598,8 +598,8 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -615,11 +615,11 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -650,8 +650,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -667,13 +667,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -688,8 +688,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -705,13 +705,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -720,13 +720,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer2.desktop") .label("TestPlayer2") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -741,8 +741,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -758,13 +758,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -773,13 +773,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer2.desktop") .label("TestPlayer2") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -788,13 +788,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer3.desktop") .label("TestPlayer3") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer3.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer3.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer3.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer3.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -809,8 +809,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -826,13 +826,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -841,13 +841,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer2.desktop") .label("TestPlayer2") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -856,7 +856,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer3.desktop") .label("TestPlayer3") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) ) .item(mh::MenuItemMatcher() @@ -870,8 +870,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -887,13 +887,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -902,7 +902,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer2.desktop") .label("TestPlayer2") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) ) .item(mh::MenuItemMatcher() @@ -911,7 +911,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer3.desktop") .label("TestPlayer3") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) ) .item(mh::MenuItemMatcher() @@ -926,8 +926,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -943,13 +943,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -958,7 +958,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer2.desktop") .label("TestPlayer2") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) ) .item(mh::MenuItemMatcher() @@ -967,7 +967,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer3.desktop") .label("TestPlayer3") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) ) .item(mh::MenuItemMatcher() @@ -982,8 +982,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -999,7 +999,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) ) .item(mh::MenuItemMatcher() @@ -1008,7 +1008,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer2.desktop") .label("TestPlayer2") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) ) .item(mh::MenuItemMatcher() @@ -1017,13 +1017,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer3.desktop") .label("TestPlayer3") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer3.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer3.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer3.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer3.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -1038,8 +1038,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -1055,13 +1055,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -1070,13 +1070,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer2.desktop") .label("TestPlayer2") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -1085,13 +1085,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer3.desktop") .label("TestPlayer3") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer3.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer3.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer3.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer3.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -1109,8 +1109,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -1126,7 +1126,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) ) .item(mh::MenuItemMatcher() @@ -1135,7 +1135,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer2.desktop") .label("TestPlayer2") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) ) .item(mh::MenuItemMatcher() @@ -1144,11 +1144,11 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer3.desktop") .label("TestPlayer3") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -1169,8 +1169,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -1186,11 +1186,11 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer3.desktop") .label("TestPlayer3") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -1199,7 +1199,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) ) .item(mh::MenuItemMatcher() @@ -1208,7 +1208,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls) .action("indicator.testplayer2.desktop") .label("TestPlayer2") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) ) .item(mh::MenuItemMatcher() @@ -1240,8 +1240,8 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -1257,13 +1257,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -1278,8 +1278,8 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -1295,13 +1295,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .attribute_not_set("x-canonical-next-action") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .attribute_not_set("x-ayatana-next-action") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -1317,8 +1317,8 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -1334,13 +1334,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .attribute_not_set("x-canonical-previous-action") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .attribute_not_set("x-canonical-next-action") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .attribute_not_set("x-ayatana-previous-action") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .attribute_not_set("x-ayatana-next-action") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -1355,8 +1355,8 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::all) .submenu() .item(mh::MenuItemMatcher() @@ -1372,13 +1372,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState) .action("indicator.testplayer1.desktop") .label("TestPlayer1") .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "org.ayatana.unity.media-player") + .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player") ) .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","org.ayatana.unity.playback-item") + .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop") + .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop") + .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop") + .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item") ) ) .item(mh::MenuItemMatcher() @@ -1427,8 +1427,8 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::starts_with) .submenu() .item(mh::MenuItemMatcher() @@ -1444,8 +1444,8 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::ends_with) .submenu() .item(mh::MenuItemMatcher() @@ -1465,9 +1465,9 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::starts_with) .submenu() @@ -1482,8 +1482,8 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .mode(mh::MenuItemMatcher::Mode::ends_with) .submenu() .item(mh::MenuItemMatcher() @@ -1514,9 +1514,9 @@ TEST_F(TestIndicator, PhoneNotificationVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::all) .submenu() @@ -1645,9 +1645,9 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::starts_with) .submenu() @@ -1688,9 +1688,9 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::starts_with) .submenu() @@ -1728,9 +1728,9 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume) EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) .item(mh::MenuItemMatcher() .action("indicator.root") - .string_attribute("x-canonical-type", "org.ayatana.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") + .string_attribute("x-ayatana-type", "org.ayatana.indicator.root") + .string_attribute("x-ayatana-scroll-action", "indicator.scroll") + .string_attribute("x-ayatana-secondary-action", "indicator.mute") .string_attribute("submenu-action", "indicator.indicator-shown") .mode(mh::MenuItemMatcher::Mode::starts_with) .submenu() diff --git a/tests/notifications-mock.h b/tests/notifications-mock.h index 3cd8570..f05ffe4 100644 --- a/tests/notifications-mock.h +++ b/tests/notifications-mock.h @@ -26,130 +26,130 @@ class NotificationsMock { - DbusTestDbusMock * mock = nullptr; - DbusTestDbusMockObject * baseobj = nullptr; - - public: - NotificationsMock (std::vector<std::string> capabilities = {"actions", "body", "body-markup", "icon-static", "image/svg+xml", "x-canonical-private-synchronous", "x-canonical-append", "x-canonical-private-icon-only", "x-canonical-truncation", "private-synchronous", "append", "private-icon-only", "truncation"}) { - mock = dbus_test_dbus_mock_new("org.freedesktop.Notifications"); - dbus_test_task_set_bus(DBUS_TEST_TASK(mock), DBUS_TEST_SERVICE_BUS_SESSION); - dbus_test_task_set_name(DBUS_TEST_TASK(mock), "Notify"); - - baseobj =dbus_test_dbus_mock_get_object(mock, "/org/freedesktop/Notifications", "org.freedesktop.Notifications", nullptr); - - std::string capspython("ret = "); - capspython += vector2py(capabilities); - dbus_test_dbus_mock_object_add_method(mock, baseobj, - "GetCapabilities", nullptr, G_VARIANT_TYPE("as"), - capspython.c_str(), nullptr); - - dbus_test_dbus_mock_object_add_method(mock, baseobj, - "GetServerInformation", nullptr, G_VARIANT_TYPE("(ssss)"), - "ret = ['notification-mock', 'Testing harness', '1.0', '1.1']", nullptr); - - dbus_test_dbus_mock_object_add_method(mock, baseobj, - "Notify", G_VARIANT_TYPE("(susssasa{sv}i)"), G_VARIANT_TYPE("u"), - "ret = 10", nullptr); - - dbus_test_dbus_mock_object_add_method(mock, baseobj, - "CloseNotification", G_VARIANT_TYPE("u"), nullptr, - "", nullptr); - } - - ~NotificationsMock () { - g_debug("Destroying the Notifications Mock"); - g_clear_object(&mock); - } - - std::string vector2py (std::vector<std::string> vect) { - std::string retval("[ "); - - std::for_each(vect.begin(), vect.end() - 1, [&retval](std::string entry) { - retval += "'"; - retval += entry; - retval += "', "; - }); - - retval += "'"; - retval += *(vect.end() - 1); - retval += "']"; - - return retval; - } - - operator std::shared_ptr<DbusTestTask> () { - std::shared_ptr<DbusTestTask> retval(DBUS_TEST_TASK(g_object_ref(mock)), [](DbusTestTask * task) { g_clear_object(&task); }); - return retval; - } - - operator DbusTestTask* () { - return DBUS_TEST_TASK(mock); - } - - operator DbusTestDbusMock* () { - return mock; - } - - struct Notification { - std::string app_name; - unsigned int replace_id; - std::string app_icon; - std::string summary; - std::string body; - std::vector<std::string> actions; - std::map<std::string, std::shared_ptr<GVariant>> hints; - int timeout; - }; - - std::shared_ptr<GVariant> childGet (GVariant * tuple, gsize index) { - return std::shared_ptr<GVariant>(g_variant_get_child_value(tuple, index), - [](GVariant * v){ if (v != nullptr) g_variant_unref(v); }); - } - - std::vector<Notification> getNotifications (void) { - std::vector<Notification> notifications; - - unsigned int cnt, i; - auto calls = dbus_test_dbus_mock_object_get_method_calls(mock, baseobj, "Notify", &cnt, nullptr); - - for (i = 0; i < cnt; i++) { - auto call = calls[i]; - Notification notification; - - notification.app_name = g_variant_get_string(childGet(call.params, 0).get(), nullptr); - notification.replace_id = g_variant_get_uint32(childGet(call.params, 1).get()); - notification.app_icon = g_variant_get_string(childGet(call.params, 2).get(), nullptr); - notification.summary = g_variant_get_string(childGet(call.params, 3).get(), nullptr); - notification.body = g_variant_get_string(childGet(call.params, 4).get(), nullptr); - notification.timeout = g_variant_get_int32(childGet(call.params, 7).get()); - - auto vactions = childGet(call.params, 5); - GVariantIter iactions = {0}; - g_variant_iter_init(&iactions, vactions.get()); - const gchar * action = nullptr; - while (g_variant_iter_loop(&iactions, "&s", &action)) { - std::string saction(action); - notification.actions.push_back(saction); - } - - auto vhints = childGet(call.params, 6); - GVariantIter ihints = {0}; - g_variant_iter_init(&ihints, vhints.get()); - const gchar * hint_key = nullptr; - GVariant * hint_value = nullptr; - while (g_variant_iter_loop(&ihints, "{&sv}", &hint_key, &hint_value)) { - std::string key(hint_key); - std::shared_ptr<GVariant> value(g_variant_ref(hint_value), [](GVariant * v){ if (v != nullptr) g_variant_unref(v); }); - notification.hints[key] = value; - } - - notifications.push_back(notification); - } - - return notifications; - } - - bool clearNotifications (void) { - return dbus_test_dbus_mock_object_clear_method_calls(mock, baseobj, nullptr); - } + DbusTestDbusMock * mock = nullptr; + DbusTestDbusMockObject * baseobj = nullptr; + + public: + NotificationsMock (std::vector<std::string> capabilities = {"actions", "body", "body-markup", "icon-static", "image/svg+xml", "x-canonical-private-synchronous", "x-canonical-append", "x-canonical-private-icon-only", "x-canonical-truncation", "private-synchronous", "append", "private-icon-only", "truncation"}) { + mock = dbus_test_dbus_mock_new("org.freedesktop.Notifications"); + dbus_test_task_set_bus(DBUS_TEST_TASK(mock), DBUS_TEST_SERVICE_BUS_SESSION); + dbus_test_task_set_name(DBUS_TEST_TASK(mock), "Notify"); + + baseobj =dbus_test_dbus_mock_get_object(mock, "/org/freedesktop/Notifications", "org.freedesktop.Notifications", nullptr); + + std::string capspython("ret = "); + capspython += vector2py(capabilities); + dbus_test_dbus_mock_object_add_method(mock, baseobj, + "GetCapabilities", nullptr, G_VARIANT_TYPE("as"), + capspython.c_str(), nullptr); + + dbus_test_dbus_mock_object_add_method(mock, baseobj, + "GetServerInformation", nullptr, G_VARIANT_TYPE("(ssss)"), + "ret = ['notification-mock', 'Testing harness', '1.0', '1.1']", nullptr); + + dbus_test_dbus_mock_object_add_method(mock, baseobj, + "Notify", G_VARIANT_TYPE("(susssasa{sv}i)"), G_VARIANT_TYPE("u"), + "ret = 10", nullptr); + + dbus_test_dbus_mock_object_add_method(mock, baseobj, + "CloseNotification", G_VARIANT_TYPE("u"), nullptr, + "", nullptr); + } + + ~NotificationsMock () { + g_debug("Destroying the Notifications Mock"); + g_clear_object(&mock); + } + + std::string vector2py (std::vector<std::string> vect) { + std::string retval("[ "); + + std::for_each(vect.begin(), vect.end() - 1, [&retval](std::string entry) { + retval += "'"; + retval += entry; + retval += "', "; + }); + + retval += "'"; + retval += *(vect.end() - 1); + retval += "']"; + + return retval; + } + + operator std::shared_ptr<DbusTestTask> () { + std::shared_ptr<DbusTestTask> retval(DBUS_TEST_TASK(g_object_ref(mock)), [](DbusTestTask * task) { g_clear_object(&task); }); + return retval; + } + + operator DbusTestTask* () { + return DBUS_TEST_TASK(mock); + } + + operator DbusTestDbusMock* () { + return mock; + } + + struct Notification { + std::string app_name; + unsigned int replace_id; + std::string app_icon; + std::string summary; + std::string body; + std::vector<std::string> actions; + std::map<std::string, std::shared_ptr<GVariant>> hints; + int timeout; + }; + + std::shared_ptr<GVariant> childGet (GVariant * tuple, gsize index) { + return std::shared_ptr<GVariant>(g_variant_get_child_value(tuple, index), + [](GVariant * v){ if (v != nullptr) g_variant_unref(v); }); + } + + std::vector<Notification> getNotifications (void) { + std::vector<Notification> notifications; + + unsigned int cnt, i; + auto calls = dbus_test_dbus_mock_object_get_method_calls(mock, baseobj, "Notify", &cnt, nullptr); + + for (i = 0; i < cnt; i++) { + auto call = calls[i]; + Notification notification; + + notification.app_name = g_variant_get_string(childGet(call.params, 0).get(), nullptr); + notification.replace_id = g_variant_get_uint32(childGet(call.params, 1).get()); + notification.app_icon = g_variant_get_string(childGet(call.params, 2).get(), nullptr); + notification.summary = g_variant_get_string(childGet(call.params, 3).get(), nullptr); + notification.body = g_variant_get_string(childGet(call.params, 4).get(), nullptr); + notification.timeout = g_variant_get_int32(childGet(call.params, 7).get()); + + auto vactions = childGet(call.params, 5); + GVariantIter iactions = {0}; + g_variant_iter_init(&iactions, vactions.get()); + const gchar * action = nullptr; + while (g_variant_iter_loop(&iactions, "&s", &action)) { + std::string saction(action); + notification.actions.push_back(saction); + } + + auto vhints = childGet(call.params, 6); + GVariantIter ihints = {0}; + g_variant_iter_init(&ihints, vhints.get()); + const gchar * hint_key = nullptr; + GVariant * hint_value = nullptr; + while (g_variant_iter_loop(&ihints, "{&sv}", &hint_key, &hint_value)) { + std::string key(hint_key); + std::shared_ptr<GVariant> value(g_variant_ref(hint_value), [](GVariant * v){ if (v != nullptr) g_variant_unref(v); }); + notification.hints[key] = value; + } + + notifications.push_back(notification); + } + + return notifications; + } + + bool clearNotifications (void) { + return dbus_test_dbus_mock_object_clear_method_calls(mock, baseobj, nullptr); + } }; diff --git a/tests/sound-menu.cc b/tests/sound-menu.cc index d41c9de..587d47f 100644 --- a/tests/sound-menu.cc +++ b/tests/sound-menu.cc @@ -92,25 +92,25 @@ class SoundMenuTest : public ::testing::Test /* Player display */ verify_item_attribute(section, 0, "action", g_variant_new_string("indicator.player-id")); - verify_item_attribute(section, 0, "x-canonical-type", g_variant_new_string("org.ayatana.unity.media-player")); + verify_item_attribute(section, 0, "x-ayatana-type", g_variant_new_string("org.ayatana.unity.media-player")); /* Player control */ - verify_item_attribute(section, 1, "x-canonical-type", g_variant_new_string("org.ayatana.unity.playback-item")); - //verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string("")); + verify_item_attribute(section, 1, "x-ayatana-type", g_variant_new_string("org.ayatana.unity.playback-item")); + //verify_item_attribute(section, 1, "x-ayatana-play-action", g_variant_new_string("")); if (!canPlay) { - verify_item_attribute_is_not_set(section, 1, "x-canonical-play-action", G_VARIANT_TYPE_STRING); + verify_item_attribute_is_not_set(section, 1, "x-ayatana-play-action", G_VARIANT_TYPE_STRING); } else { - verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string("indicator.play.player-id")); + verify_item_attribute(section, 1, "x-ayatana-play-action", g_variant_new_string("indicator.play.player-id")); } if (!canNext) { - verify_item_attribute_is_not_set(section, 1, "x-canonical-next-action", G_VARIANT_TYPE_STRING); + verify_item_attribute_is_not_set(section, 1, "x-ayatana-next-action", G_VARIANT_TYPE_STRING); } else { - verify_item_attribute(section, 1, "x-canonical-next-action", g_variant_new_string("indicator.next.player-id")); + verify_item_attribute(section, 1, "x-ayatana-next-action", g_variant_new_string("indicator.next.player-id")); } if (!canPrev) { - verify_item_attribute_is_not_set(section, 1, "x-canonical-previous-action", G_VARIANT_TYPE_STRING); + verify_item_attribute_is_not_set(section, 1, "x-ayatana-previous-action", G_VARIANT_TYPE_STRING); } else { - verify_item_attribute(section, 1, "x-canonical-previous-action", g_variant_new_string("indicator.previous.player-id")); + verify_item_attribute(section, 1, "x-ayatana-previous-action", g_variant_new_string("indicator.previous.player-id")); } g_clear_object(§ion); @@ -164,13 +164,13 @@ TEST_F(SoundMenuTest, AddRemovePlayer) { /* Player display */ verify_item_attribute(section, 0, "action", g_variant_new_string("indicator.player-id")); - verify_item_attribute(section, 0, "x-canonical-type", g_variant_new_string("org.ayatana.unity.media-player")); + verify_item_attribute(section, 0, "x-ayatana-type", g_variant_new_string("org.ayatana.unity.media-player")); /* Player control */ - verify_item_attribute(section, 1, "x-canonical-type", g_variant_new_string("org.ayatana.unity.playback-item")); - verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string("indicator.play.player-id")); - verify_item_attribute(section, 1, "x-canonical-next-action", g_variant_new_string("indicator.next.player-id")); - verify_item_attribute(section, 1, "x-canonical-previous-action", g_variant_new_string("indicator.previous.player-id")); + verify_item_attribute(section, 1, "x-ayatana-type", g_variant_new_string("org.ayatana.unity.playback-item")); + verify_item_attribute(section, 1, "x-ayatana-play-action", g_variant_new_string("indicator.play.player-id")); + verify_item_attribute(section, 1, "x-ayatana-next-action", g_variant_new_string("indicator.next.player-id")); + verify_item_attribute(section, 1, "x-ayatana-previous-action", g_variant_new_string("indicator.previous.player-id")); g_clear_object(§ion); |