Use GtkEntry instead of EIconEntry in the main search bar.

4 files changed, 127 insertions, 692 deletions

diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index b5579088e1..00172ea5f5 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -23,13 +23,13 @@
 
 #include <glib/gi18n.h>
 
-#include <filter/rule-editor.h>
-#include <widgets/misc/e-action-combo-box.h>
-#include <widgets/misc/e-icon-entry.h>
+#include "e-util/e-binding.h"
+#include "filter/rule-editor.h"
+#include "widgets/misc/e-action-combo-box.h"
 
-#include <e-shell-backend.h>
-#include <e-shell-view.h>
-#include <e-shell-window-actions.h>
+#include "e-shell-backend.h"
+#include "e-shell-view.h"
+#include "e-shell-window-actions.h"
 
 #define E_SHELL_CONTENT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -95,8 +95,9 @@ action_search_execute_cb (GtkAction *action,
 {
 	EShellView *shell_view;
 	EShellWindow *shell_window;
-	EIconEntry *icon_entry;
-	GtkStateType visual_state;
+	GtkWidget *widget;
+	const GdkColor *base_color;
+	const GdkColor *text_color;
 	const gchar *search_text;
 
 	/* EShellView subclasses are responsible for actually
@@ -108,15 +109,22 @@ action_search_execute_cb (GtkAction *action,
 	if (!e_shell_view_is_active (shell_view))
 		return;
 
-	icon_entry = E_ICON_ENTRY (shell_content->priv->search_entry);
+	widget = shell_content->priv->search_entry;
 	search_text = e_shell_content_get_search_text (shell_content);
 
-	if (search_text != NULL && *search_text != '\0')
-		visual_state = GTK_STATE_SELECTED;
-	else
-		visual_state = GTK_STATE_NORMAL;
+	if (search_text != NULL && *search_text != '\0') {
+		GtkStyle *style;
+
+		style = gtk_widget_get_default_style ();
+		base_color = &style->base[GTK_STATE_SELECTED];
+		text_color = &style->text[GTK_STATE_SELECTED];
+	} else {
+		base_color = NULL;
+		text_color = NULL;
+	}
 
-	e_icon_entry_set_visual_state (icon_entry, visual_state);
+	gtk_widget_modify_base (widget, GTK_STATE_NORMAL, base_color);
+	gtk_widget_modify_text (widget, GTK_STATE_NORMAL, text_color);
 
 	action = E_SHELL_WINDOW_ACTION_SEARCH_CLEAR (shell_window);
 	gtk_action_set_sensitive (action, TRUE);
@@ -154,16 +162,12 @@ shell_content_entry_focus_in_cb (EShellContent *shell_content,
                                  GdkEventFocus *focus_event,
                                  GtkWidget *entry)
 {
-	EIconEntry *icon_entry;
-	GtkStateType visual_state;
-
-	icon_entry = E_ICON_ENTRY (shell_content->priv->search_entry);
-	visual_state = e_icon_entry_get_visual_state (icon_entry);
-
-	if (visual_state == GTK_STATE_INSENSITIVE)
+	/* Clear the "background" text. */
+	if (shell_content->priv->search_state == GTK_STATE_INSENSITIVE)
 		gtk_entry_set_text (GTK_ENTRY (entry), "");
 
-	e_icon_entry_set_visual_state (icon_entry, GTK_STATE_NORMAL);
+	gtk_widget_modify_base (entry, GTK_STATE_NORMAL, NULL);
+	gtk_widget_modify_text (entry, GTK_STATE_NORMAL, NULL);
 
 	return FALSE;
 }
@@ -177,6 +181,48 @@ shell_content_entry_focus_out_cb (EShellContent *shell_content,
 	return FALSE;
 }
 
+static void
+shell_content_entry_icon_press_cb (EShellContent *shell_content,
+                                   GtkEntryIconPosition icon_pos,
+                                   GdkEvent *event)
+{
+	EShellView *shell_view;
+	EShellWindow *shell_window;
+	GtkAction *action;
+
+	/* Show the search options menu when the icon is pressed. */
+
+	if (icon_pos != GTK_ENTRY_ICON_PRIMARY)
+		return;
+
+	shell_view = e_shell_content_get_shell_view (shell_content);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	action = E_SHELL_WINDOW_ACTION_SEARCH_OPTIONS (shell_window);
+	gtk_action_activate (action);
+}
+
+static void
+shell_content_entry_icon_release_cb (EShellContent *shell_content,
+                                     GtkEntryIconPosition icon_pos,
+                                     GdkEvent *event)
+{
+	EShellView *shell_view;
+	EShellWindow *shell_window;
+	GtkAction *action;
+
+	/* Clear the search when the icon is pressed and released. */
+
+	if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
+		return;
+
+	shell_view = e_shell_content_get_shell_view (shell_content);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	action = E_SHELL_WINDOW_ACTION_SEARCH_CLEAR (shell_window);
+	gtk_action_activate (action);
+}
+
 static gboolean
 shell_content_entry_key_press_cb (EShellContent *shell_content,
                                   GdkEventKey *key_event,
@@ -500,7 +546,6 @@ shell_content_constructed (GObject *object)
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	EShellContent *shell_content;
-	EIconEntry *icon_entry;
 	GtkSizeGroup *size_group;
 	GtkAction *action;
 	GtkWidget *widget;
@@ -508,11 +553,17 @@ shell_content_constructed (GObject *object)
 	shell_content = E_SHELL_CONTENT (object);
 	shell_view = e_shell_content_get_shell_view (shell_content);
 	shell_window = e_shell_view_get_shell_window (shell_view);
-	icon_entry = E_ICON_ENTRY (shell_content->priv->search_entry);
 	size_group = e_shell_view_get_size_group (shell_view);
 
+	widget = shell_content->priv->search_entry;
+
 	action = E_SHELL_WINDOW_ACTION_SEARCH_CLEAR (shell_window);
-	e_icon_entry_add_action_end (icon_entry, action);
+	e_binding_new (
+		G_OBJECT (action), "sensitive",
+		G_OBJECT (widget), "secondary-icon-sensitive");
+	e_binding_new (
+		G_OBJECT (action), "stock-id",
+		G_OBJECT (widget), "secondary-icon-stock");
 
 	action = E_SHELL_WINDOW_ACTION_SEARCH_EXECUTE (shell_window);
 	g_signal_connect (
@@ -520,7 +571,12 @@ shell_content_constructed (GObject *object)
 		G_CALLBACK (action_search_execute_cb), shell_content);
 
 	action = E_SHELL_WINDOW_ACTION_SEARCH_OPTIONS (shell_window);
-	e_icon_entry_add_action_start (icon_entry, action);
+	e_binding_new (
+		G_OBJECT (action), "sensitive",
+		G_OBJECT (widget), "primary-icon-sensitive");
+	e_binding_new (
+		G_OBJECT (action), "stock-id",
+		G_OBJECT (widget), "primary-icon-stock");
 
 	widget = shell_content->priv->search_bar;
 	gtk_size_group_add_widget (size_group, widget);
@@ -773,7 +829,6 @@ shell_content_init (EShellContent *shell_content)
 	GtkLabel *label;
 	GtkWidget *mnemonic;
 	GtkWidget *widget;
-	EIconEntry *icon_entry;
 
 	shell_content->priv = E_SHELL_CONTENT_GET_PRIVATE (shell_content);
 
@@ -826,37 +881,51 @@ shell_content_init (EShellContent *shell_content)
 
 	/* Search Entry Widgets */
 
-	widget = e_icon_entry_new ();
+	widget = gtk_entry_new ();
 	gtk_box_pack_end (box, widget, FALSE, FALSE, 0);
 	shell_content->priv->search_entry = g_object_ref (widget);
 	shell_content->priv->search_state = GTK_STATE_NORMAL;
 	gtk_widget_show (widget);
 
-	icon_entry = E_ICON_ENTRY (widget);
-
-	/* Translators: This is part of the quick search interface.
-	 * example: Search: [_______________] in [ Current Folder ] */
-	widget = gtk_label_new_with_mnemonic (_("Sear_ch:"));
-	gtk_box_pack_end (box, widget, FALSE, FALSE, 0);
-	shell_content->priv->search_label = g_object_ref (widget);
-	gtk_widget_show (widget);
-
-	label = GTK_LABEL (widget);
-
-	widget = e_icon_entry_get_entry (icon_entry);
-	gtk_label_set_mnemonic_widget (label, widget);
 	g_signal_connect_swapped (
 		widget, "activate",
-		G_CALLBACK (shell_content_entry_activated_cb), shell_content);
+		G_CALLBACK (shell_content_entry_activated_cb),
+		shell_content);
+
 	g_signal_connect_swapped (
 		widget, "focus-in-event",
-		G_CALLBACK (shell_content_entry_focus_in_cb), shell_content);
+		G_CALLBACK (shell_content_entry_focus_in_cb),
+		shell_content);
+
 	g_signal_connect_swapped (
 		widget, "focus-out-event",
-		G_CALLBACK (shell_content_entry_focus_out_cb), shell_content);
+		G_CALLBACK (shell_content_entry_focus_out_cb),
+		shell_content);
+
+	g_signal_connect_swapped (
+		widget, "icon-press",
+		G_CALLBACK (shell_content_entry_icon_press_cb),
+		shell_content);
+
+	g_signal_connect_swapped (
+		widget, "icon-release",
+		G_CALLBACK (shell_content_entry_icon_release_cb),
+		shell_content);
+
 	g_signal_connect_swapped (
 		widget, "key-press-event",
-		G_CALLBACK (shell_content_entry_key_press_cb), shell_content);
+		G_CALLBACK (shell_content_entry_key_press_cb),
+		shell_content);
+
+	mnemonic = widget;
+
+	/* Translators: This is part of the quick search interface.
+	 * example: Search: [_______________] in [ Current Folder ] */
+	widget = gtk_label_new_with_mnemonic (_("Sear_ch:"));
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), mnemonic);
+	gtk_box_pack_end (box, widget, FALSE, FALSE, 0);
+	shell_content->priv->search_label = g_object_ref (widget);
+	gtk_widget_show (widget);
 }
 
 GType
@@ -967,6 +1036,7 @@ e_shell_content_set_filter_action (EShellContent *shell_content,
 	combo_box = E_ACTION_COMBO_BOX (shell_content->priv->filter_combo_box);
 
 	e_action_combo_box_set_action (combo_box, filter_action);
+
 	g_object_notify (G_OBJECT (shell_content), "filter-action");
 }
 
@@ -993,6 +1063,7 @@ e_shell_content_set_filter_value (EShellContent *shell_content,
 	combo_box = E_ACTION_COMBO_BOX (shell_content->priv->filter_combo_box);
 
 	e_action_combo_box_set_current_value (combo_box, filter_value);
+
 	g_object_notify (G_OBJECT (shell_content), "filter-value");
 }
 
@@ -1076,40 +1147,38 @@ e_shell_content_set_search_rule (EShellContent *shell_content,
 		g_object_unref (shell_content->priv->search_rule);
 
 	shell_content->priv->search_rule = search_rule;
+
 	g_object_notify (G_OBJECT (shell_content), "search-rule");
 }
 
 const gchar *
 e_shell_content_get_search_text (EShellContent *shell_content)
 {
-	EIconEntry *icon_entry;
-	GtkWidget *text_entry;
+	GtkEntry *entry;
 
 	g_return_val_if_fail (E_IS_SHELL_CONTENT (shell_content), NULL);
 
 	if (shell_content->priv->search_state == GTK_STATE_INSENSITIVE)
 		return "";
 
-	icon_entry = E_ICON_ENTRY (shell_content->priv->search_entry);
-	text_entry = e_icon_entry_get_entry (icon_entry);
+	entry = GTK_ENTRY (shell_content->priv->search_entry);
 
-	return gtk_entry_get_text (GTK_ENTRY (text_entry));
+	return gtk_entry_get_text (entry);
 }
 
 void
 e_shell_content_set_search_text (EShellContent *shell_content,
                                  const gchar *search_text)
 {
-	EIconEntry *icon_entry;
-	GtkWidget *text_entry;
+	GtkEntry *entry;
 
 	g_return_if_fail (E_IS_SHELL_CONTENT (shell_content));
 
-	icon_entry = E_ICON_ENTRY (shell_content->priv->search_entry);
-	text_entry = e_icon_entry_get_entry (icon_entry);
-
+	entry = GTK_ENTRY (shell_content->priv->search_entry);
 	search_text = (search_text != NULL) ? search_text : "";
-	gtk_entry_set_text (GTK_ENTRY (text_entry), search_text);
+
+	gtk_entry_set_text (entry, search_text);
+
 	g_object_notify (G_OBJECT (shell_content), "search-text");
 }
 
@@ -1159,6 +1228,7 @@ e_shell_content_set_scope_action (EShellContent *shell_content,
 	combo_box = E_ACTION_COMBO_BOX (shell_content->priv->scope_combo_box);
 
 	e_action_combo_box_set_action (combo_box, scope_action);
+
 	g_object_notify (G_OBJECT (shell_content), "scope-action");
 }
 
@@ -1185,6 +1255,7 @@ e_shell_content_set_scope_value (EShellContent *shell_content,
 	combo_box = E_ACTION_COMBO_BOX (shell_content->priv->scope_combo_box);
 
 	e_action_combo_box_set_current_value (combo_box, scope_value);
+
 	g_object_notify (G_OBJECT (shell_content), "scope-value");
 }
 
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index d6a42f10c2..56a927041e 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -61,7 +61,6 @@ widgetsinclude_HEADERS =			\
 	e-file-activity.h			\
 	e-gui-utils.h				\
 	e-hsv-utils.h				\
-	e-icon-entry.h				\
 	e-image-chooser.h			\
 	e-map.h					\
 	e-menu-tool-button.h			\
@@ -124,7 +123,6 @@ libemiscwidgets_la_SOURCES =			\
 	e-file-activity.c			\
 	e-gui-utils.c				\
 	e-hsv-utils.c				\
-	e-icon-entry.c				\
 	e-image-chooser.c			\
 	e-map.c					\
 	e-menu-tool-button.c			\
diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c
deleted file mode 100644
index 6da15943e4..0000000000
--- a/widgets/misc/e-icon-entry.c
+++ /dev/null
@@ -1,543 +0,0 @@
-/*
- *  e-icon-entry.c
- *
- *  Author: Johnny Jacob <jjohnny@novell.com>
- *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Copyright (C) 2003, 2004, 2005  Christian Persch
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- *
- *  Adapted and modified from gtk+ code:
- *
- *  Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *  Modified by the GTK+ Team and others 1997-2005.  See the AUTHORS
- *  file in the gtk+ distribution for a list of people on the GTK+ Team.
- *  See the ChangeLog in the gtk+ distribution files for a list of changes.
- *  These files are distributed with GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- *
- */
-
-#include "e-icon-entry.h"
-
-#define E_ICON_ENTRY_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_ICON_ENTRY, EIconEntryPrivate))
-
-struct _EIconEntryPrivate {
-	GtkStateType visual_state;
-	GtkWidget *entry;
-	GtkWidget *hbox;
-};
-
-enum {
-	PROP_0,
-	PROP_VISUAL_STATE
-};
-
-static gpointer parent_class;
-
-static void
-icon_entry_proxy_set_cursor (GtkWidget *widget,
-                             GdkEventCrossing *event)
-{
-	if (event->type == GDK_ENTER_NOTIFY) {
-		GdkCursor *cursor;
-
-		cursor = gdk_cursor_new (GDK_HAND1);
-		gdk_window_set_cursor (widget->window, cursor);
-		gdk_cursor_unref (cursor);
-	} else
-		gdk_window_set_cursor (widget->window, NULL);
-}
-
-static GtkWidget *
-icon_entry_create_proxy (GtkAction *action)
-{
-	GtkWidget *proxy;
-	GtkWidget *widget;
-	gchar *tooltip;
-
-	proxy = gtk_event_box_new ();
-	gtk_event_box_set_visible_window (GTK_EVENT_BOX (proxy), FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (proxy), 2);
-	gtk_widget_show (proxy);
-
-	widget = gtk_action_create_icon (action, GTK_ICON_SIZE_MENU);
-	gtk_container_add (GTK_CONTAINER (proxy), widget);
-	gtk_widget_show (widget);
-
-	g_object_get (action, "tooltip", &tooltip, NULL);
-	gtk_widget_set_tooltip_text (proxy, tooltip);
-	g_free (tooltip);
-
-	g_signal_connect_swapped (
-		proxy, "button-press-event",
-		G_CALLBACK (gtk_action_activate), action);
-	g_signal_connect_after (
-		proxy, "enter-notify-event",
-		G_CALLBACK (icon_entry_proxy_set_cursor), NULL);
-	g_signal_connect_after (
-		proxy, "leave-notify-event",
-		G_CALLBACK (icon_entry_proxy_set_cursor), NULL);
-
-	return proxy;
-}
-static gboolean
-icon_entry_focus_change_cb (GtkWidget *widget,
-			    GdkEventFocus *event,
-			    GtkWidget *entry)
-{
-	gtk_widget_queue_draw (entry);
-
-	return FALSE;
-}
-
-static void
-icon_entry_get_borders (GtkWidget *widget,
-			GtkWidget *entry,
-			gint *xborder,
-			gint *yborder)
-{
-	gint focus_width;
-	gboolean interior_focus;
-
-	g_return_if_fail (entry->style != NULL);
-
-	gtk_widget_style_get (
-		entry, "focus-line-width", &focus_width,
-		"interior-focus", &interior_focus, NULL);
-
-	*xborder = entry->style->xthickness;
-	*yborder = entry->style->ythickness;
-
-	if (!interior_focus) {
-		*xborder += focus_width;
-		*yborder += focus_width;
-	}
-}
-
-static void
-icon_entry_paint (GtkWidget *widget,
-                  GdkEventExpose *event)
-{
-	EIconEntry *entry = E_ICON_ENTRY (widget);
-	GtkWidget *entry_widget = entry->priv->entry;
-	gint x = 0, y = 0, width, height, focus_width;
-	gboolean interior_focus;
-
-	gtk_widget_style_get (
-		entry_widget,
-		"interior-focus", &interior_focus,
-		"focus-line-width", &focus_width, NULL);
-
-	gdk_drawable_get_size (widget->window, &width, &height);
-
-	if (GTK_WIDGET_HAS_FOCUS (entry_widget) && !interior_focus) {
-		x += focus_width;
-		y += focus_width;
-		width -= 2 * focus_width;
-		height -= 2 * focus_width;
-	}
-
-	gtk_paint_flat_box (
-		entry_widget->style, widget->window,
-		GTK_WIDGET_STATE (entry_widget), GTK_SHADOW_NONE,
-		NULL, entry_widget, "entry_bg",
-		/* FIXME: was 0, 0 in gtk_entry_expose, but I think this is correct: */
-		x, y, width, height);
-
-	gtk_paint_shadow (
-		entry_widget->style, widget->window,
-		GTK_STATE_NORMAL, GTK_SHADOW_IN,
-		NULL, entry_widget, "entry",
-		x, y, width, height);
-
-	if (GTK_WIDGET_HAS_FOCUS (entry_widget) && !interior_focus) {
-		x -= focus_width;
-		y -= focus_width;
-		width += 2 * focus_width;
-		height += 2 * focus_width;
-
-		gtk_paint_focus (
-			entry_widget->style, widget->window,
-			GTK_WIDGET_STATE (entry_widget),
-			NULL, entry_widget, "entry",
-			/* FIXME: was 0, 0 in gtk_entry_draw_frame, but I think this is correct: */
-			x, y, width, height);
-	}
-}
-
-static void
-icon_entry_set_property (GObject *object,
-                         guint property_id,
-                         const GValue *value,
-                         GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_VISUAL_STATE:
-			e_icon_entry_set_visual_state (
-				E_ICON_ENTRY (object),
-				g_value_get_enum (value));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-icon_entry_get_property (GObject *object,
-                         guint property_id,
-                         GValue *value,
-                         GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_VISUAL_STATE:
-			g_value_set_enum (
-				value, e_icon_entry_get_visual_state (
-				E_ICON_ENTRY (object)));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-icon_entry_dispose (GObject *object)
-{
-	EIconEntryPrivate *priv;
-
-	priv = E_ICON_ENTRY_GET_PRIVATE (object);
-
-	if (priv->entry != NULL) {
-		g_object_unref (priv->entry);
-		priv->entry = NULL;
-	}
-
-	if (priv->hbox != NULL) {
-		g_object_unref (priv->hbox);
-		priv->hbox = NULL;
-	}
-
-	/* Chain up to parent's dispose() method. */
-	G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-icon_entry_realize (GtkWidget *widget)
-{
-	GdkWindowAttr attributes;
-	gint attributes_mask;
-	gint border_width;
-
-	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
-	border_width = GTK_CONTAINER (widget)->border_width;
-
-	attributes.x = widget->allocation.x + border_width;
-	attributes.y = widget->allocation.y + border_width;
-	attributes.width = widget->allocation.width - 2 * border_width;
-	attributes.height = widget->allocation.height - 2 * border_width;
-	attributes.window_type = GDK_WINDOW_CHILD;
-	attributes.event_mask = gtk_widget_get_events (widget)
-				| GDK_EXPOSURE_MASK;
-
-	attributes.visual = gtk_widget_get_visual (widget);
-	attributes.colormap = gtk_widget_get_colormap (widget);
-	attributes.wclass = GDK_INPUT_OUTPUT;
-	attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-
-	widget->window = gdk_window_new (
-		gtk_widget_get_parent_window (widget),
-		&attributes, attributes_mask);
-
-	gdk_window_set_user_data (widget->window, widget);
-
-	widget->style = gtk_style_attach (widget->style, widget->window);
-
-	gtk_style_set_background (
-		widget->style, widget->window, GTK_STATE_NORMAL);
-}
-
-static void
-icon_entry_size_request (GtkWidget *widget,
-                         GtkRequisition *requisition)
-{
-	EIconEntryPrivate *priv;
-	GtkContainer *container;
-	GtkWidget *child;
-	gint xborder, yborder;
-
-	priv = E_ICON_ENTRY_GET_PRIVATE (widget);
-	container = GTK_CONTAINER (widget);
-
-	requisition->width = container->border_width * 2;
-	requisition->height = container->border_width * 2;
-
-	gtk_widget_ensure_style (priv->entry);
-	icon_entry_get_borders (widget, priv->entry, &xborder, &yborder);
-
-	child = GTK_BIN (widget)->child;
-	if (GTK_WIDGET_VISIBLE (child)) {
-		GtkRequisition child_requisition;
-
-		gtk_widget_size_request (child, &child_requisition);
-		requisition->width += child_requisition.width;
-		requisition->height += child_requisition.height;
-	}
-
-	requisition->width += 2 * xborder;
-	requisition->height += 2 * yborder;
-}
-
-static void
-icon_entry_size_allocate (GtkWidget *widget,
-                          GtkAllocation *allocation)
-{
-	EIconEntryPrivate *priv;
-	GtkContainer *container;
-	GtkAllocation child_allocation;
-	gint xborder, yborder;
-	gint width, height;
-
-	priv = E_ICON_ENTRY_GET_PRIVATE (widget);
-	container = GTK_CONTAINER (widget);
-
-	widget->allocation = *allocation;
-
-	icon_entry_get_borders (widget, priv->entry, &xborder, &yborder);
-
-	if (GTK_WIDGET_REALIZED (widget)) {
-		width = allocation->width - container->border_width * 2;
-		height = allocation->height - container->border_width * 2;
-
-		child_allocation.x = container->border_width;
-		child_allocation.y = container->border_width;
-		child_allocation.width = MAX (width, 0);
-		child_allocation.height = MAX (height, 0);
-
-		gdk_window_move_resize (
-			widget->window,
-			allocation->x + child_allocation.x,
-			allocation->y + child_allocation.y,
-			child_allocation.width,
-			child_allocation.height);
-	}
-
-	width = allocation->width - (container->border_width + xborder) * 2;
-	height = allocation->height - (container->border_width + yborder) * 2;
-
-	child_allocation.x = container->border_width + xborder;
-	child_allocation.y = container->border_width + yborder;
-	child_allocation.width = MAX (width, 0);
-	child_allocation.height = MAX (height, 0);
-
-	gtk_widget_size_allocate (GTK_BIN (widget)->child, &child_allocation);
-}
-
-static gboolean
-icon_entry_expose (GtkWidget *widget,
-                   GdkEventExpose *event)
-{
-	if (GTK_WIDGET_DRAWABLE (widget) && event->window == widget->window)
-		icon_entry_paint (widget, event);
-
-	/* Chain up to parent's expose() method. */
-	return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
-}
-
-static void
-icon_entry_class_init (EIconEntryClass *class)
-{
-	GObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	parent_class = g_type_class_peek_parent (class);
-	g_type_class_add_private (class, sizeof (EIconEntryPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->set_property = icon_entry_set_property;
-	object_class->get_property = icon_entry_get_property;
-	object_class->dispose = icon_entry_dispose;
-
-	widget_class = GTK_WIDGET_CLASS (class);
-	widget_class->realize = icon_entry_realize;
-	widget_class->size_request = icon_entry_size_request;
-	widget_class->size_allocate = icon_entry_size_allocate;
-	widget_class->expose_event = icon_entry_expose;
-
-	g_object_class_install_property (
-		object_class,
-		PROP_VISUAL_STATE,
-		g_param_spec_enum (
-			"visual-state",
-			NULL,
-			NULL,
-			GTK_TYPE_STATE_TYPE,
-			GTK_STATE_NORMAL,
-			G_PARAM_READWRITE));
-}
-
-static void
-icon_entry_init (EIconEntry *icon_entry)
-{
-	GtkWidget *widget;
-	GtkWidget *container;
-
-	icon_entry->priv = E_ICON_ENTRY_GET_PRIVATE (icon_entry);
-	icon_entry->priv->visual_state = GTK_STATE_NORMAL;
-
-	GTK_WIDGET_UNSET_FLAGS (icon_entry, GTK_NO_WINDOW);
-
-	widget = gtk_hbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (icon_entry), widget);
-	icon_entry->priv->hbox = g_object_ref (widget);
-	gtk_widget_show (widget);
-
-	container = widget;
-
-	widget = gtk_entry_new ();
-	gtk_entry_set_has_frame (GTK_ENTRY (widget), FALSE);
-	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
-	icon_entry->priv->entry = g_object_ref (widget);
-	gtk_widget_show (widget);
-
-	/* We need to queue a redraw when focus changes, to comply with
-	 * themes (like Clearlooks) which draw focused and unfocused
-	 * entries differently. */
-	g_signal_connect_after (
-		widget, "focus-in-event",
-		G_CALLBACK (icon_entry_focus_change_cb), icon_entry);
-	g_signal_connect_after (
-		widget, "focus-out-event",
-		G_CALLBACK (icon_entry_focus_change_cb), icon_entry);
-}
-
-GType
-e_icon_entry_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0))
-	{
-		static const GTypeInfo type_info = {
-			sizeof (EIconEntryClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) icon_entry_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,  /* class_data */
-			sizeof (EIconEntry),
-			0,     /* n_preallocs */
-			(GInstanceInitFunc) icon_entry_init,
-			NULL   /* value_table */
-		};
-
-		type = g_type_register_static (
-			GTK_TYPE_BIN, "EIconEntry", &type_info, 0);
-	}
-
-	return type;
-}
-
-GtkWidget *
-e_icon_entry_new (void)
-{
-	return GTK_WIDGET (g_object_new (E_TYPE_ICON_ENTRY, NULL));
-}
-
-GtkWidget *
-e_icon_entry_get_entry (EIconEntry *icon_entry)
-{
-	g_return_val_if_fail (E_IS_ICON_ENTRY (icon_entry), NULL);
-
-	return icon_entry->priv->entry;
-}
-
-void
-e_icon_entry_add_action_start (EIconEntry *icon_entry,
-                               GtkAction *action)
-{
-	GtkWidget *proxy;
-	GtkBox *box;
-
-	g_return_if_fail (E_IS_ICON_ENTRY (icon_entry));
-	g_return_if_fail (GTK_IS_ACTION (action));
-
-	box = GTK_BOX (icon_entry->priv->hbox);
-	proxy = icon_entry_create_proxy (action);
-	gtk_box_pack_start (box, proxy, FALSE, FALSE, 2);
-	gtk_box_reorder_child (box, proxy, 0);
-}
-
-void
-e_icon_entry_add_action_end (EIconEntry *icon_entry,
-                             GtkAction *action)
-{
-	GtkWidget *proxy;
-	GtkBox *box;
-
-	g_return_if_fail (E_IS_ICON_ENTRY (icon_entry));
-	g_return_if_fail (GTK_IS_ACTION (action));
-
-	box = GTK_BOX (icon_entry->priv->hbox);
-	proxy = icon_entry_create_proxy (action);
-	gtk_box_pack_end (box, proxy, FALSE, FALSE, 2);
-}
-
-GtkStateType
-e_icon_entry_get_visual_state (EIconEntry *icon_entry)
-{
-	g_return_val_if_fail (E_IS_ICON_ENTRY (icon_entry), GTK_STATE_NORMAL);
-
-	return icon_entry->priv->visual_state;
-}
-
-void
-e_icon_entry_set_visual_state (EIconEntry *icon_entry,
-                               GtkStateType visual_state)
-{
-	GtkWidget *widget;
-	const GdkColor *base_color;
-	const GdkColor *text_color;
-
-	g_return_if_fail (E_IS_ICON_ENTRY (icon_entry));
-
-	if (visual_state == GTK_STATE_NORMAL) {
-		base_color = NULL;
-		text_color = NULL;
-	} else {
-		GtkStyle *style;
-
-		style = gtk_widget_get_default_style ();
-		base_color = &style->base[visual_state];
-		text_color = &style->text[visual_state];
-	}
-
-	widget = GTK_WIDGET (icon_entry);
-	gtk_widget_modify_base (widget, GTK_STATE_NORMAL, base_color);
-
-	widget = icon_entry->priv->entry;
-	gtk_widget_modify_base (widget, GTK_STATE_NORMAL, base_color);
-	gtk_widget_modify_text (widget, GTK_STATE_NORMAL, text_color);
-
-	widget = icon_entry->priv->hbox;
-	gtk_widget_modify_base (widget, GTK_STATE_NORMAL, base_color);
-
-	icon_entry->priv->visual_state = visual_state;
-	g_object_notify (G_OBJECT (icon_entry), "visual-state");
-}
diff --git a/widgets/misc/e-icon-entry.h b/widgets/misc/e-icon-entry.h
deleted file mode 100644
index e18b0fdbe0..0000000000
--- a/widgets/misc/e-icon-entry.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  e-icon-entry.h
- *
- *  Authors: Johnny Jacob <jjohnny@novell.com>
- *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Adapted and modified from Epiphany.
- *
- *  Copyright (C) 2003, 2004, 2005  Christian Persch
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- *
- *  Adapted and modified from gtk+ code:
- *
- *  Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *  Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- *  file in the gtk+ distribution for a list of people on the GTK+ Team.
- *  See the ChangeLog in the gtk+ distribution files for a list of changes.
- *  These files are distributed with GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- *
- */
-
-#ifndef E_ICON_ENTRY_H
-#define E_ICON_ENTRY_H
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-/* Standard GObject macros */
-#define E_TYPE_ICON_ENTRY \
-	(e_icon_entry_get_type())
-#define E_ICON_ENTRY(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_ICON_ENTRY, EIconEntry))
-#define E_ICON_ENTRY_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_ICON_ENTRY, EIconEntryClass))
-#define E_IS_ICON_ENTRY(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_ICON_ENTRY))
-#define E_IS_ICON_ENTRY_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_ICON_ENTRY))
-#define E_ICON_ENTRY_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_ICON_ENTRY, EIconEntryClass))
-
-typedef struct _EIconEntry EIconEntry;
-typedef struct _EIconEntryClass	EIconEntryClass;
-typedef struct _EIconEntryPrivate EIconEntryPrivate;
-
-struct _EIconEntry
-{
-	GtkBin parent;
-	EIconEntryPrivate *priv;
-};
-
-struct _EIconEntryClass
-{
-	GtkBinClass parent_class;
-};
-
-GType		e_icon_entry_get_type		(void);
-GtkWidget *	e_icon_entry_new		(void);
-GtkWidget *	e_icon_entry_get_entry		(EIconEntry *entry);
-void		e_icon_entry_add_action_start	(EIconEntry *entry,
-						 GtkAction *action);
-void		e_icon_entry_add_action_end	(EIconEntry *entry,
-						 GtkAction *action);
-GtkStateType	e_icon_entry_get_visual_state	(EIconEntry *entry);
-void		e_icon_entry_set_visual_state	(EIconEntry *entry,
-                                                 GtkStateType visual_state);
-
-G_END_DECLS
-
-#endif