[gnome-control-center/gnome-3-10] sound: use row-activated to listen to alert sound changes
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/gnome-3-10] sound: use row-activated to listen to alert sound changes
- Date: Mon, 16 Mar 2015 10:01:08 +0000 (UTC)
commit b2eeb168dbaee2b55e29f09216ce0e9a2b1c9c3c
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sat Mar 14 17:01:27 2015 -0700
sound: use row-activated to listen to alert sound changes
We currently install two signal handlers for button-press-event and
selection-changed. As the former also calls the latter, the two interact
in non-obvious ways that can lead to two alerts being played at the same
time under certain circumstances.
Avoid this problem by setting activate-on-single-click on the tree view
and listening to the row-activated signal to drive previews and model
changes.
https://bugzilla.gnome.org/show_bug.cgi?id=671446
panels/sound/gvc-sound-theme-chooser.c | 48 ++++++--------------------------
1 files changed, 9 insertions(+), 39 deletions(-)
---
diff --git a/panels/sound/gvc-sound-theme-chooser.c b/panels/sound/gvc-sound-theme-chooser.c
index 79f1c65..62eda8c 100644
--- a/panels/sound/gvc-sound-theme-chooser.c
+++ b/panels/sound/gvc-sound-theme-chooser.c
@@ -490,20 +490,17 @@ play_preview_for_id (GvcSoundThemeChooser *chooser,
}
static void
-on_treeview_selection_changed (GtkTreeSelection *selection,
- GvcSoundThemeChooser *chooser)
+on_treeview_row_activated (GtkTreeView *treeview,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ GvcSoundThemeChooser *chooser)
{
GtkTreeModel *model;
GtkTreeIter iter;
char *id;
- if (chooser->priv->treeview == NULL) {
- return;
- }
-
model = gtk_tree_view_get_model (GTK_TREE_VIEW (chooser->priv->treeview));
-
- if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {
+ if (!gtk_tree_model_get_iter (model, &iter, path)) {
return;
}
@@ -520,31 +517,6 @@ on_treeview_selection_changed (GtkTreeSelection *selection,
g_free (id);
}
-static gboolean
-on_treeview_button_pressed (GtkTreeView *treeview,
- GdkEventButton *event,
- GvcSoundThemeChooser *chooser)
-{
- GtkTreeSelection *selection;
- GtkTreePath *path;
-
- selection = gtk_tree_view_get_selection (treeview);
- if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (treeview),
- event->x, event->y, &path, NULL, NULL, NULL) == FALSE) {
- return FALSE;
- }
-
- if (gtk_tree_selection_path_is_selected (selection, path) == FALSE) {
- gtk_tree_path_free (path);
- return FALSE;
- }
- gtk_tree_path_free (path);
-
- on_treeview_selection_changed (selection, chooser);
-
- return FALSE;
-}
-
static GtkWidget *
create_alert_treeview (GvcSoundThemeChooser *chooser)
{
@@ -556,17 +528,15 @@ create_alert_treeview (GvcSoundThemeChooser *chooser)
treeview = gtk_tree_view_new ();
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
+ gtk_tree_view_set_activate_on_single_click (GTK_TREE_VIEW (treeview), TRUE);
+
g_signal_connect (treeview,
- "button-press-event",
- G_CALLBACK (on_treeview_button_pressed),
+ "row-activated",
+ G_CALLBACK (on_treeview_row_activated),
chooser);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
- g_signal_connect (selection,
- "changed",
- G_CALLBACK (on_treeview_selection_changed),
- chooser);
/* Setup the tree model, 3 columns:
* - display name
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]