Skip to content
Snippets Groups Projects
Commit 08b66e08 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#1116] Clear text in history and contacts

parent 78db0953
No related branches found
No related tags found
No related merge requests found
......@@ -79,8 +79,7 @@ history_is_visible (GtkTreeModel* model, GtkTreeIter* iter, gpointer data UNUSED
if(G_VALUE_HOLDS_STRING(&val)){
text = (gchar *)g_value_get_string(&val);
}
if(text != NULL &&
( g_ascii_strncasecmp(search, _("Search history"), 14) != 0 && g_ascii_strncasecmp(search, _("Search contact"), 14) != 0)){
if(text != NULL ){
return g_regex_match_simple(search, text, G_REGEX_CASELESS, 0);
}
g_value_unset (&val);
......
......@@ -102,12 +102,10 @@ GtkWidget* searchbar_new(gchar* searchbar_type) {
sexy_icon_entry_add_clear_button( SEXY_ICON_ENTRY(searchbox) );
#endif
// GTK_WIDGET_SET_FLAGS (GTK_WIDGET(searchbox),GTK_CAN_FOCUS);
// gtk_widget_set_name (searchbox, "searchbar");
gtk_widget_modify_text(searchbox, GTK_STATE_NORMAL, &GRAY_COLOR);
gtk_entry_set_text(GTK_ENTRY(searchbox), _("Search contact"));
g_signal_connect_after(GTK_ENTRY(searchbox), "changed", G_CALLBACK(searchbar_entry_changed), NULL);
g_signal_connect_after(GTK_ENTRY(searchbox), "grab-focus", G_CALLBACK(searchbar_clear_entry_if_default), NULL);
......@@ -118,11 +116,7 @@ GtkWidget* searchbar_new(gchar* searchbar_type) {
gtk_box_pack_start(GTK_BOX(ret), searchbox, TRUE, TRUE, 0);
if(g_strcmp0(searchbar_type,"history") == 0)
{
gtk_entry_set_text(GTK_ENTRY(searchbox), _("Search history"));
history_set_searchbar_widget(searchbox);
}
return ret;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment