From 0b4efe3bedfdad3ddc45eff5beba5fc475d89137 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 8 Jan 2015 12:40:43 -0200 Subject: [PATCH] window: don't change the header title when changed As strongly recommended by the design team, it's redundant to have the 'Results for 'xyz'' title. --- src/gcal-window.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/gcal-window.c b/src/gcal-window.c index 286e3a56..e731a038 100644 --- a/src/gcal-window.c +++ b/src/gcal-window.c @@ -525,11 +525,7 @@ static void search_view_closed (GtkPopover *popover, gpointer user_data) { - GcalWindowPrivate *priv; - - priv = gcal_window_get_instance_private (GCAL_WINDOW (user_data)); - - gtk_header_bar_set_custom_title (GTK_HEADER_BAR (priv->header_bar), priv->views_switcher); + ; } static void @@ -1039,14 +1035,12 @@ search_toggled (GObject *object, gtk_widget_show (priv->search_bar); /* update header_bar widget */ - gtk_header_bar_set_custom_title (GTK_HEADER_BAR (priv->header_bar), NULL); gcal_search_view_search (GCAL_SEARCH_VIEW (priv->views[GCAL_WINDOW_VIEW_SEARCH]), NULL, NULL); } else { g_debug ("Leaving search mode"); /* update header_bar */ - gtk_header_bar_set_title (GTK_HEADER_BAR (priv->header_bar), _("Calendar")); priv->leaving_search_mode = TRUE; } } @@ -1064,19 +1058,6 @@ search_changed (GtkEditable *editable, /* perform the search */ gcal_search_view_search (GCAL_SEARCH_VIEW (priv->views[GCAL_WINDOW_VIEW_SEARCH]), "summary", gtk_entry_get_text (GTK_ENTRY (priv->search_entry))); - - if (gtk_entry_get_text_length (GTK_ENTRY (priv->search_entry)) != 0) - { - gchar *title; - - title = g_strdup_printf (_("Results for \"%s\""), gtk_entry_get_text (GTK_ENTRY (priv->search_entry))); - gtk_header_bar_set_title (GTK_HEADER_BAR (priv->header_bar), title); - g_free (title); - } - else - { - gtk_header_bar_set_title (GTK_HEADER_BAR (priv->header_bar), _("Calendar")); - } } }