aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/sound-service-dbus.c2
-rw-r--r--src/title-widget.c14
2 files changed, 9 insertions, 7 deletions
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index 9be39c7..b493ce8 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -295,6 +295,8 @@ static gboolean sound_service_dbus_blacklist_player (SoundServiceDbus* self,
gchar* player_name,
gboolean blacklist)
{
+ g_return_val_if_fail (player_name != NULL, FALSE);
+
gboolean result = FALSE;
GSettings* our_settings = NULL;
our_settings = g_settings_new ("com.canonical.indicators.sound");
diff --git a/src/title-widget.c b/src/title-widget.c
index 675c59f..b8058b8 100644
--- a/src/title-widget.c
+++ b/src/title-widget.c
@@ -44,8 +44,8 @@ static void title_widget_dispose (GObject *object);
static void title_widget_finalize (GObject *object);
// keyevent consumers
-static gboolean title_widget_button_press_event (GtkWidget *menuitem,
- GdkEventButton *event);
+static gboolean title_widget_button_release_event (GtkWidget *menuitem,
+ GdkEventButton *event);
// Dbusmenuitem properties update callback
static void title_widget_property_update(DbusmenuMenuitem* item, gchar* property,
@@ -64,7 +64,7 @@ title_widget_class_init (TitleWidgetClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- widget_class->button_press_event = title_widget_button_press_event;
+ widget_class->button_release_event = title_widget_button_release_event;
g_type_class_add_private (klass, sizeof (TitleWidgetPrivate));
@@ -132,8 +132,8 @@ title_widget_finalize (GObject *object)
/* Suppress/consume keyevents */
static gboolean
-title_widget_button_press_event (GtkWidget *menuitem,
- GdkEventButton *event)
+title_widget_button_release_event (GtkWidget *menuitem,
+ GdkEventButton *event)
{
//g_debug("TitleWidget::menu_press_event");
TitleWidgetPrivate * priv = TITLE_WIDGET_GET_PRIVATE(menuitem);
@@ -147,8 +147,8 @@ title_widget_button_press_event (GtkWidget *menuitem,
}
static void
-title_widget_property_update(DbusmenuMenuitem* item, gchar* property,
- GVariant* value, gpointer userdata)
+title_widget_property_update (DbusmenuMenuitem* item, gchar* property,
+ GVariant* value, gpointer userdata)
{
g_return_if_fail (IS_TITLE_WIDGET (userdata));
TitleWidget* mitem = TITLE_WIDGET(userdata);