diff options
author | Conor Curran <conor.curran@canonical.com> | 2011-01-11 09:13:20 -0600 |
---|---|---|
committer | Conor Curran <conor.curran@canonical.com> | 2011-01-11 09:13:20 -0600 |
commit | 765d17777a49c1742371216b46b2992ff7dfc191 (patch) | |
tree | 5f09a96124d525e29d1ac2b0e7755b76d768bbc7 | |
parent | 4f18accfeba38149b17f2c92a6b1520f14100e50 (diff) | |
download | ayatana-indicator-sound-765d17777a49c1742371216b46b2992ff7dfc191.tar.gz ayatana-indicator-sound-765d17777a49c1742371216b46b2992ff7dfc191.tar.bz2 ayatana-indicator-sound-765d17777a49c1742371216b46b2992ff7dfc191.zip |
working nicely
-rw-r--r-- | src/title-widget.c | 2 | ||||
-rw-r--r-- | src/transport-menu-item.vala | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/title-widget.c b/src/title-widget.c index bbb5e6d..675c59f 100644 --- a/src/title-widget.c +++ b/src/title-widget.c @@ -154,7 +154,7 @@ title_widget_property_update(DbusmenuMenuitem* item, gchar* property, TitleWidget* mitem = TITLE_WIDGET(userdata); if(g_ascii_strcasecmp(DBUSMENU_TITLE_MENUITEM_NAME, property) == 0){ gtk_menu_item_set_label (GTK_MENU_ITEM(mitem), - g_value_get_string(value)); + g_variant_get_string(value, NULL)); } else if(g_ascii_strcasecmp(DBUSMENU_TITLE_MENUITEM_ICON, property) == 0){ title_widget_set_icon (mitem); diff --git a/src/transport-menu-item.vala b/src/transport-menu-item.vala index 55ee3b3..e93f0bb 100644 --- a/src/transport-menu-item.vala +++ b/src/transport-menu-item.vala @@ -47,11 +47,20 @@ public class TransportMenuitem : PlayerItem this.property_set_int(MENUITEM_PLAY_STATE, update); } - public override void handle_event(string name, Variant input_value, uint timestamp) + public override void handle_event(string name, + Variant input_value, + uint timestamp) { - int input = input_value.get_int32(); - debug("handle_event with value %s", input.to_string()); - debug("transport owner name = %s", this.owner.app_info.get_name()); + /*debug ( "Handle event in transport menu item - input variant is of type %s", + input_value.get_type_string() );*/ + Variant v = input_value; + if ( input_value.is_of_type ( VariantType.VARIANT) ){ + v = input_value.get_variant(); + } + + int32 input = v.get_int32(); + debug("transport menu item -> handle_event with value %s", input.to_string()); + //debug("transport owner name = %s", this.owner.app_info.get_name()); this.owner.mpris_bridge.transport_update((action)input); } |