From 5d12f06367a0939387381f66cea77766a873aea6 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 20 May 2009 18:09:34 -0400
Subject: =?UTF-8?q?Bug=20580925=20=E2=80=93=20Better=20search=20bar=20for?=
 =?UTF-8?q?=20word=20searches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make the word search bar more like Firefox and get rid of the "Current
Message" search scope in the folder search bar.  Shift+Ctrl+F now
activates the word search bar.
---
 data/icons/Makefile.am                      |  22 ++++++++++++++++------
 data/icons/hicolor_status_16x16_wrapped.png | Bin 0 -> 680 bytes
 2 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 data/icons/hicolor_status_16x16_wrapped.png

(limited to 'data')

diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 23f4d9de09..54b5f4bbf4 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -34,19 +34,19 @@ private_icons = \
 	hicolor_actions_16x16_folder-move.png \
 	hicolor_actions_16x16_mail-copy.png \
 	hicolor_actions_16x16_mail-move.png \
- 	hicolor_actions_16x16_go-today.png \
+	hicolor_actions_16x16_go-today.png \
 	hicolor_actions_16x16_view-calendar-day.png \
 	hicolor_actions_16x16_view-calendar-list.png \
 	hicolor_actions_16x16_view-calendar-month.png \
 	hicolor_actions_16x16_view-calendar-week.png \
 	hicolor_actions_16x16_view-calendar-workweek.png \
- 	hicolor_actions_22x22_go-today.png \
+	hicolor_actions_22x22_go-today.png \
 	hicolor_actions_22x22_view-calendar-day.png \
 	hicolor_actions_22x22_view-calendar-list.png \
 	hicolor_actions_22x22_view-calendar-month.png \
 	hicolor_actions_22x22_view-calendar-week.png \
 	hicolor_actions_22x22_view-calendar-workweek.png \
- 	hicolor_actions_24x24_go-today.png \
+	hicolor_actions_24x24_go-today.png \
 	hicolor_actions_24x24_query-free-busy.png \
 	hicolor_actions_24x24_view-calendar-day.png \
 	hicolor_actions_24x24_view-calendar-list.png \
@@ -79,18 +79,28 @@ private_icons = \
 	hicolor_places_24x24_mail-inbox.png \
 	hicolor_places_24x24_mail-outbox.png \
 	hicolor_places_24x24_mail-sent.png \
+	hicolor_status_16x16_wrapped.png \
 	hicolor_status_32x32_offline.png \
 	hicolor_status_32x32_online.png \
 	$(NULL)
 
+# hicolor_status_16x16_wrapped.png was copied from Firefox
+# (toolkit/themes/gnomestripe/global/icons/wrap.png), which
+# contained the following notice:
+#
+#     All files in this directory are assumed to be licensed under the
+#     tri-license (MPL/GPL/LGPL) used throughout this codebase.
+#
+# There is no corresponding SVG file. */
+
 noinst_DATA = \
- 	hicolor_actions_16x16_go-today.svg \
+	hicolor_actions_16x16_go-today.svg \
 	hicolor_actions_16x16_view-calendar-day.svg \
 	hicolor_actions_16x16_view-calendar-list.svg \
 	hicolor_actions_16x16_view-calendar-month.svg \
 	hicolor_actions_16x16_view-calendar-week.svg \
 	hicolor_actions_16x16_view-calendar-workweek.svg \
- 	hicolor_actions_22x22_go-today.svg \
+	hicolor_actions_22x22_go-today.svg \
 	hicolor_actions_22x22_view-calendar-day.svg \
 	hicolor_actions_22x22_view-calendar-list.svg \
 	hicolor_actions_22x22_view-calendar-month.svg \
@@ -109,7 +119,7 @@ noinst_DATA = \
 	hicolor_places_22x22_mail-sent.svg \
 	hicolor_status_32x32_offline.svg \
 	hicolor_status_32x32_online.svg \
- 	$(NULL)
+	$(NULL)
 
 EXTRA_DIST = \
 	$(public_icons)		\
diff --git a/data/icons/hicolor_status_16x16_wrapped.png b/data/icons/hicolor_status_16x16_wrapped.png
new file mode 100644
index 0000000000..32492d5e8b
Binary files /dev/null and b/data/icons/hicolor_status_16x16_wrapped.png differ
-- 
cgit v1.2.3