[nautilus] search-bar: use GtkSearchEntry
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] search-bar: use GtkSearchEntry
- Date: Tue, 12 Jun 2012 01:57:27 +0000 (UTC)
commit 217185b485edcd8983d44500b2a69bf20992ed78
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Jun 11 21:57:03 2012 -0400
search-bar: use GtkSearchEntry
configure.in | 2 +-
src/nautilus-search-bar.c | 16 +---------------
2 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/configure.in b/configure.in
index f7e9cd1..4b4f20c 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl ===========================================================================
m4_define(glib_minver, 2.31.9)
m4_define(gnome_desktop_minver, 3.0.0)
m4_define(pango_minver, 1.28.3)
-m4_define(gtk_minver, 3.5.3)
+m4_define(gtk_minver, 3.5.5)
m4_define(xml_minver, 2.7.8)
m4_define(exif_minver, 0.6.20)
m4_define(exempi_minver, 2.1.0)
diff --git a/src/nautilus-search-bar.c b/src/nautilus-search-bar.c
index 97b7951..0154a0d 100644
--- a/src/nautilus-search-bar.c
+++ b/src/nautilus-search-bar.c
@@ -110,15 +110,6 @@ entry_has_text (NautilusSearchBar *bar)
}
static void
-entry_icon_release_cb (GtkEntry *entry,
- GtkEntryIconPosition position,
- GdkEvent *event,
- NautilusSearchBar *bar)
-{
- g_signal_emit_by_name (entry, "activate", 0);
-}
-
-static void
entry_activate_cb (GtkWidget *entry, NautilusSearchBar *bar)
{
if (entry_has_text (bar) && !bar->details->entry_borrowed) {
@@ -160,16 +151,11 @@ nautilus_search_bar_init (NautilusSearchBar *bar)
gtk_box_pack_start (GTK_BOX (bar), align, TRUE, TRUE, 0);
gtk_widget_show (align);
- bar->details->entry = gtk_entry_new ();
- gtk_entry_set_icon_from_icon_name (GTK_ENTRY (bar->details->entry),
- GTK_ENTRY_ICON_SECONDARY,
- "edit-find-symbolic");
+ bar->details->entry = gtk_search_entry_new ();
gtk_container_add (GTK_CONTAINER (align), bar->details->entry);
g_signal_connect (bar->details->entry, "activate",
G_CALLBACK (entry_activate_cb), bar);
- g_signal_connect (bar->details->entry, "icon-release",
- G_CALLBACK (entry_icon_release_cb), bar);
gtk_widget_show (bar->details->entry);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]