aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-06-22 14:54:03 +0100
committerConor Curran <conor.curran@canonical.com>2010-06-22 14:54:03 +0100
commitb77c81f85bc219790f5a079e9b888b6ae3627739 (patch)
treebe27299b86e8186e4750ccfd80e0b72def6fe4ad
parent38e16eeeff6ec6f54662cc4da194e2ad1e024241 (diff)
downloadayatana-indicator-sound-b77c81f85bc219790f5a079e9b888b6ae3627739.tar.gz
ayatana-indicator-sound-b77c81f85bc219790f5a079e9b888b6ae3627739.tar.bz2
ayatana-indicator-sound-b77c81f85bc219790f5a079e9b888b6ae3627739.zip
merge requests point of interest
-rw-r--r--src/mpris-controller.vala1
-rw-r--r--src/transport-widget.c10
2 files changed, 10 insertions, 1 deletions
diff --git a/src/mpris-controller.vala b/src/mpris-controller.vala
index 64a46e6..a6d27be 100644
--- a/src/mpris-controller.vala
+++ b/src/mpris-controller.vala
@@ -89,5 +89,6 @@ public class MprisController : GLib.Object
ht.insert("state", v);
this.controller.custom_items[this.controller.TRANSPORT].update(ht, TransportMenuitem.attributes_format());
}
+
}
diff --git a/src/transport-widget.c b/src/transport-widget.c
index 9077c41..bc9df53 100644
--- a/src/transport-widget.c
+++ b/src/transport-widget.c
@@ -136,6 +136,7 @@ transport_widget_init (TransportWidget *self)
hbox = gtk_hbox_new(TRUE, 2);
gchar* symbol = transport_widget_toggle_play_label(dbusmenu_menuitem_property_get_int(twin_item, DBUSMENU_TRANSPORT_MENUITEM_PLAY_STATE));
priv->play_button = gtk_button_new_with_label(symbol);
+ //g_free(symbol);
gtk_box_pack_start (GTK_BOX (hbox), priv->play_button, FALSE, TRUE, 0);
priv->hbox = hbox;
@@ -167,6 +168,9 @@ transport_widget_button_press_event (GtkWidget *menuitem,
GdkEventButton *event)
{
g_debug("TransportWidget::menu_press_event");
+ if(IS_TRANSPORT_WIDGET(menuitem) == FALSE){
+ return FALSE;
+ }
TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE(TRANSPORT_WIDGET(menuitem));
@@ -196,6 +200,10 @@ transport_widget_button_release_event (GtkWidget *menuitem,
GdkEventButton *event)
{
g_debug("TransportWidget::menu_release_event");
+ if(IS_TRANSPORT_WIDGET(menuitem) == FALSE){
+ return FALSE;
+ }
+
TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE(TRANSPORT_WIDGET(menuitem));
gtk_widget_event (priv->hbox, (GdkEvent*)event);
@@ -208,7 +216,7 @@ transport_widget_button_release_event (GtkWidget *menuitem,
**/
static void
transport_widget_property_update(DbusmenuMenuitem* item, gchar* property,
- GValue* value, gpointer userdata)
+ GValue* value, gpointer userdata)
{
g_debug("transport_widget_update_state - with property %s", property);
int update_value = g_value_get_int(value);