[totem] grilo: Fix wrong source being selected
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] grilo: Fix wrong source being selected
- Date: Fri, 17 Jan 2014 14:11:15 +0000 (UTC)
commit 1a3d654c28bcee9c2d5b00cd11dac2b57214faae
Author: Bastien Nocera <hadess hadess net>
Date: Fri Jan 17 15:04:55 2014 +0100
grilo: Fix wrong source being selected
- Click search icon
- Click search icon again
- "Recent" is selected, but "Channels" shown
src/plugins/grilo/totem-grilo.c | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/src/plugins/grilo/totem-grilo.c b/src/plugins/grilo/totem-grilo.c
index 69657f7..36f95b2 100644
--- a/src/plugins/grilo/totem-grilo.c
+++ b/src/plugins/grilo/totem-grilo.c
@@ -1239,19 +1239,6 @@ selection_mode_requested (GdMainView *view,
gtk_tree_path_free (root);
}
-static void
-search_mode_changed (GObject *gobject,
- GParamSpec *pspec,
- TotemGriloPlugin *self)
-{
- gboolean search_mode;
-
- search_mode = totem_main_toolbar_get_search_mode (TOTEM_MAIN_TOOLBAR (self->priv->header));
- if (!search_mode)
- set_browser_filter_model_for_path (self, NULL);
-
- self->priv->in_search = search_mode;
-}
static void
view_selection_changed_cb (GdMainView *view,
@@ -1352,6 +1339,24 @@ setup_source_switcher (TotemGriloPlugin *self)
}
static void
+search_mode_changed (GObject *gobject,
+ GParamSpec *pspec,
+ TotemGriloPlugin *self)
+{
+ gboolean search_mode;
+
+ search_mode = totem_main_toolbar_get_search_mode (TOTEM_MAIN_TOOLBAR (self->priv->header));
+ if (!search_mode) {
+ /* One of those will fail, as there's the toggle
+ * button won't be active */
+ source_switched (self->priv->recent, self);
+ source_switched (self->priv->channels, self);
+ }
+
+ self->priv->in_search = search_mode;
+}
+
+static void
setup_browse (TotemGriloPlugin *self,
GtkBuilder *builder)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]