From b32649a94cd485f742d2ad5f1b76d7385393e137 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 10 Oct 2007 04:54:36 +0000
Subject: ** Fixes bug #437579

2007-10-09  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #437579

	* addressbook/conduit/address-conduit.c:
	* addressbook/gui/component/addressbook-config.c:
	* addressbook/gui/contact-editor/e-contact-editor.c:
	* addressbook/gui/widgets/eab-gui-util.c:
	* calendar/conduits/calendar/calendar-conduit.c:
	* calendar/conduits/memo/memo-conduit.c:
	* calendar/conduits/todo/todo-conduit.c:
	* calendar/gui/dialogs/alarm-dialog.c:
	* calendar/gui/dialogs/event-page.c:
	* calendar/gui/dialogs/memo-page.c:
	* calendar/gui/dialogs/task-page.c:
	* calendar/gui/e-day-view-layout.c:
	* calendar/gui/e-day-view-layout.h:
	* calendar/gui/print.c:
	* e-util/e-pilot-map.c:
	* e-util/e-plugin.c:
	* e-util/e-profile-event.c:
	* e-util/e-signature.c:
	* filter/filter-file.c:
	* mail/e-searching-tokenizer.c:
	* mail/em-folder-browser.c:
	* mail/em-format-html.c:
	* mail/em-format-view.c:
	* mail/em-format.c:
	* mail/em-mailer-prefs.c:
	* mail/em-mailer-prefs.h:
	* mail/mail-session.c:
	* mail/mail-session.h:
	* mail/mail-vfolder.c:
	* mail/message-list.c:
	* plugins/bbdb/bbdb.c:
	* plugins/bbdb/gaimbuddies.c:
	* plugins/calendar-http/calendar-http.c:
	* plugins/exchange-operations/exchange-user-dialog.c:
	* plugins/face/face.c:
	* shell/e-shell-window.c:
	* shell/e-shell.c:
	* smime/lib/e-cert-db.c:
	* tools/killev.c:
	* widgets/misc/e-cursors.c:
	* widgets/misc/e-spinner.c:
	* widgets/misc/e-unicode.c:
	* widgets/table/e-table-field-chooser-item.c:
	* widgets/table/e-table-header-item.c:
	* widgets/table/e-table-header-item.h:
	* widgets/table/e-table-header-utils.c:
	* widgets/table/e-table.c:
	* widgets/text/e-text.c:
	Fix various compiler warnings.  Patch from Milan Crha.


svn path=/trunk/; revision=34368
---
 mail/em-folder-browser.c | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'mail/em-folder-browser.c')

diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 95638fd74c..4cb10acae4 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -111,7 +111,6 @@ struct _EMFolderBrowserPrivate {
 
 	guint search_menu_activated_id;
 	guint search_activated_id;
-	guint search_query_changed_id;
 
 	double default_scroll_position;
 	guint idle_scroll_id;
@@ -142,7 +141,6 @@ static void emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, cons
 static void emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char *query, void *data);
 static void emfb_search_menu_activated(ESearchBar *esb, int id, EMFolderBrowser *emfb);
 static void emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb);
-static void emfb_search_query_changed(ESearchBar *esb, EMFolderBrowser *emfb);
 static void emfb_search_search_cleared(ESearchBar *esb);
 
 static int emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, EMFolderBrowser *emfb);
@@ -471,7 +469,6 @@ emfb_init(GObject *o)
 
 		p->search_menu_activated_id = g_signal_connect(emfb->search, "menu_activated", G_CALLBACK(emfb_search_menu_activated), emfb);
 		p->search_activated_id = g_signal_connect(emfb->search, "search_activated", G_CALLBACK(emfb_search_search_activated), emfb);
-/* 		p->search_query_changed_id = g_signal_connect(emfb->search, "query_changed", G_CALLBACK(emfb_search_query_changed), emfb); */
 		g_signal_connect(emfb->search, "search_cleared", G_CALLBACK(emfb_search_search_cleared), NULL);
 		
 		gtk_box_pack_start((GtkBox *)emfb, (GtkWidget *)emfb->search, FALSE, TRUE, 0);
@@ -1147,29 +1144,6 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb)
 	camel_exception_free (ex);
 }
 
-static void
-emfb_search_query_changed(ESearchBar *esb, EMFolderBrowser *emfb)
-{
-	int search_scope;
-	int item_id;
-
-	search_scope = e_search_bar_get_search_scope (esb);
-	item_id = e_search_bar_get_item_id (esb);
-
-	/* Close the current message search bar */
-	if ( search_scope != E_FILTERBAR_CURRENT_MESSAGE_ID ) {
-		em_format_html_display_search_close (emfb->view.preview);
-		gtk_widget_set_sensitive (esb->option_button, TRUE);
-	} else
-		gtk_widget_set_sensitive (esb->option_button, FALSE);
-	
-	switch (item_id) {
-	    case E_FILTERBAR_ADVANCED_ID:
-		    emfb_search_search_activated(esb, emfb);
-		    break;
-	}
-}
-
 static void
 emfb_search_search_cleared(ESearchBar *esb)
 {
-- 
cgit v1.2.3