aboutsummaryrefslogtreecommitdiff
path: root/src/transport-widget.c
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-01-10 20:25:36 +0000
committerConor Curran <conor.curran@canonical.com>2011-01-10 20:25:36 +0000
commit82425f25064d97b0feb2c0c5cdc839558bf5f51f (patch)
treead51e43395b5abea04a0ffd9a3e9f35200699853 /src/transport-widget.c
parent5f7a9d979b49674604160ce4baac403c79832470 (diff)
downloadayatana-indicator-sound-82425f25064d97b0feb2c0c5cdc839558bf5f51f.tar.gz
ayatana-indicator-sound-82425f25064d97b0feb2c0c5cdc839558bf5f51f.tar.bz2
ayatana-indicator-sound-82425f25064d97b0feb2c0c5cdc839558bf5f51f.zip
getting there
Diffstat (limited to 'src/transport-widget.c')
-rw-r--r--src/transport-widget.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/transport-widget.c b/src/transport-widget.c
index d7f4b75..9b45734 100644
--- a/src/transport-widget.c
+++ b/src/transport-widget.c
@@ -112,8 +112,8 @@ static gboolean transport_widget_leave_notify_event (GtkWidget *menuitem
GdkEventCrossing *event);
static void transport_widget_property_update ( DbusmenuMenuitem* item,
gchar * property,
- GValue * value,
- gpointer userdata );
+ GVariant * value,
+ gpointer userdata );
static void transport_widget_menu_hidden ( GtkWidget *menu,
TransportWidget *transport);
static void transport_widget_notify ( GObject *item,
@@ -344,13 +344,11 @@ transport_widget_button_release_event (GtkWidget *menuitem,
TransportWidgetEvent result = transport_widget_determine_button_event ( transport,
event );
if(result != TRANSPORT_NADA){
- GValue value = {0};
- g_value_init(&value, G_TYPE_INT);
//g_debug("TransportWidget::menu_press_event - going to send value %i", (int)result);
- g_value_set_int(&value, (int)result);
+ GVariant* new_transport_state = g_variant_new_int32 ((int)result);
dbusmenu_menuitem_handle_event ( priv->twin_item,
"Transport state change",
- &value,
+ new_transport_state,
0 );
}
transport_widget_react_to_button_release ( transport,
@@ -402,13 +400,11 @@ transport_widget_react_to_key_release_event ( TransportWidget* transport,
{
if(transport_event != TRANSPORT_NADA){
TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE ( transport );
- GValue value = {0};
- g_value_init(&value, G_TYPE_INT);
//g_debug("TransportWidget::menu_press_event - going to send value %i", (int)result);
- g_value_set_int(&value, (int)transport_event);
+ GVariant* new_transport_event = g_variant_new_int32((int)transport_event);
dbusmenu_menuitem_handle_event ( priv->twin_item,
"Transport state change",
- &value,
+ new_transport_event,
0 );
}
transport_widget_react_to_button_release ( transport,
@@ -1700,7 +1696,7 @@ transport_widget_set_twin_item(TransportWidget* self,
**/
static void
transport_widget_property_update(DbusmenuMenuitem* item, gchar* property,
- GValue* value, gpointer userdata)
+ GVariant* value, gpointer userdata)
{
//g_debug("transport_widget_update_state - with property %s", property);
TransportWidget* bar = (TransportWidget*)userdata;
@@ -1708,7 +1704,7 @@ transport_widget_property_update(DbusmenuMenuitem* item, gchar* property,
if(g_ascii_strcasecmp(DBUSMENU_TRANSPORT_MENUITEM_PLAY_STATE, property) == 0)
{
- int update_value = g_value_get_int(value);
+ int update_value = g_variant_get_int32(value);
//g_debug("transport_widget_update_state - with value %i", update_value);
transport_widget_toggle_play_pause(bar, (TransportWidgetState)update_value);
}