Search bar improvements.

Split the search entry into a new widget to manage hints (EHintedEntry).
Let the search entry expand to use available horizontal space.

1 files changed, 24 insertions, 1 deletions

diff --git a/calendar/module/e-cal-shell-view-actions.c b/calendar/module/e-cal-shell-view-actions.c
index a5d0dd826b..5f5380d919 100644
--- a/calendar/module/e-cal-shell-view-actions.c
+++ b/calendar/module/e-cal-shell-view-actions.c
@@ -297,6 +297,29 @@ action_calendar_rename_cb (GtkAction *action,
 }
 
 static void
+action_calendar_search_cb (GtkRadioAction *action,
+                           GtkRadioAction *current,
+                           ECalShellView *cal_shell_view)
+{
+	EShellView *shell_view;
+	EShellContent *shell_content;
+	const gchar *search_hint;
+
+	/* XXX Figure out a way to handle this in EShellContent
+	 *     instead of every shell view having to handle it.
+	 *     The problem is EShellContent does not know what
+	 *     the search option actions are for this view.  It
+	 *     would have to dig up the popup menu and retrieve
+	 *     the action for each menu item.  Seems messy. */
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_content = e_shell_view_get_shell_content (shell_view);
+
+	search_hint = gtk_action_get_label (GTK_ACTION (current));
+	e_shell_content_set_search_hint (shell_content, search_hint);
+}
+
+static void
 action_calendar_select_one_cb (GtkAction *action,
                                ECalShellView *cal_shell_view)
 {
@@ -1051,7 +1074,7 @@ e_cal_shell_view_actions_init (ECalShellView *cal_shell_view)
 		action_group, calendar_search_entries,
 		G_N_ELEMENTS (calendar_search_entries),
 		CALENDAR_SEARCH_SUMMARY_CONTAINS,
-		NULL, NULL);
+		G_CALLBACK (action_calendar_search_cb), cal_shell_view);
 
 	/* Lockdown Printing Actions */
 	action_group = ACTION_GROUP (LOCKDOWN_PRINTING);