Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcal-window: updated to new GtkSearchBar API

Browse Source
This commit is contained in:
Erick Pérez Castellanos
2014-12-04 17:10:22 -05:00
parent 09f6261550
commit a71491377e
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-window.c
+6 -9
View File
@@ -302,11 +302,11 @@ gcal_window_constructed (GObject *object)
gtk_container_add (GTK_CONTAINER (box), priv->search_entry); gtk_container_add (GTK_CONTAINER (box), priv->search_entry);
priv->search_bar = gtk_search_bar_new (); priv->search_bar = gtk_search_bar_new ();
gtk_search_bar_set_entry (GTK_SEARCH_BAR (priv->search_bar), gtk_search_bar_connect_entry (GTK_SEARCH_BAR (priv->search_bar),
GTK_ENTRY (priv->search_entry)); GTK_ENTRY (priv->search_entry));
gtk_widget_set_hexpand (priv->search_bar, TRUE); gtk_widget_set_hexpand (priv->search_bar, TRUE);
g_object_bind_property (search_button, "active", g_object_bind_property (search_button, "active",
priv->search_bar, "search-mode", priv->search_bar, "search-mode-enabled",
G_BINDING_BIDIRECTIONAL); G_BINDING_BIDIRECTIONAL);
gtk_container_add (GTK_CONTAINER (priv->search_bar), box); gtk_container_add (GTK_CONTAINER (priv->search_bar), box);
gtk_container_add (GTK_CONTAINER (priv->main_box), priv->search_bar); gtk_container_add (GTK_CONTAINER (priv->main_box), priv->search_bar);
@@ -336,7 +336,7 @@ gcal_window_constructed (GObject *object)
G_CALLBACK (gcal_window_add_event), object); G_CALLBACK (gcal_window_add_event), object);
g_signal_connect (priv->views_overlay, "get-child-position", g_signal_connect (priv->views_overlay, "get-child-position",
G_CALLBACK (gcal_window_place_new_event_widget), object); G_CALLBACK (gcal_window_place_new_event_widget), object);
g_signal_connect (priv->search_bar, "notify::search-mode", g_signal_connect (priv->search_bar, "notify::search-mode-enabled",
G_CALLBACK (gcal_window_search_toggled), object); G_CALLBACK (gcal_window_search_toggled), object);
g_signal_connect (priv->search_entry, "changed", g_signal_connect (priv->search_entry, "changed",
G_CALLBACK (gcal_window_search_changed), object); G_CALLBACK (gcal_window_search_changed), object);
@@ -512,15 +512,12 @@ gcal_window_search_changed (GtkEditable *editable,
if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (priv->search_bar))) if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (priv->search_bar)))
{ {
GtkWidget *entry;
gchar *title; gchar *title;
entry = gtk_search_bar_get_entry (GTK_SEARCH_BAR (priv->search_bar)); if (gtk_entry_get_text_length (GTK_ENTRY (priv->search_entry)) != 0)
if (gtk_entry_get_text_length (GTK_ENTRY (entry)) != 0)
{ {
title = g_strdup_printf ("Results for \"%s\"", title = g_strdup_printf ("Results for \"%s\"",
gtk_entry_get_text (GTK_ENTRY (entry))); gtk_entry_get_text (GTK_ENTRY (priv->search_entry)));
gtk_header_bar_set_title (GTK_HEADER_BAR (priv->header_bar), gtk_header_bar_set_title (GTK_HEADER_BAR (priv->header_bar),
title); title);
} }