cleanup the view menus if they were created.

2004-05-10  Not Zed  <NotZed@Ximian.com>

        * em-folder-view.c (emfv_activate): cleanup the view menus if they
        were created.

        * em-folder-view.h: added list_active bit, means the view is
        showing the list and needs e.g. view menus.

        * em-folder-view.c (emfv_setup_view_instance): was
        create_view_instance.  Now also setup the menu's if we're showing the list.

        * em-folder-browser.c (emfb_create_view_menus): removed.  moved
        functionality into emfolderview.

2004-05-07  Not Zed  <NotZed@Ximian.com>

        * mail-account-editor.c: include missing header.

svn path=/trunk/; revision=25827

1 files changed, 1 insertions, 39 deletions

diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index df15cb9230..d512351b9f 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -66,9 +66,6 @@
 #include <widgets/misc/e-filter-bar.h>
 #include <camel/camel-search-private.h>
 
-/* gal view crap */
-#include "widgets/menus/gal-view-menus.h"
-
 #include "e-util/e-dialog-utils.h"
 #include "em-utils.h"
 #include "em-composer-utils.h"
@@ -91,8 +88,6 @@ struct _EMFolderBrowserPrivate {
 
 	GtkWidget *subscribe_editor;
 
-	GalViewMenus *view_menus;
-
 	guint search_menu_activated_id;
 	guint search_activated_id;
 	guint search_query_changed_id;
@@ -169,6 +164,7 @@ emfb_init(GObject *o)
 	p = emfb->priv = g_malloc0(sizeof(struct _EMFolderBrowserPrivate));
 
 	emfb->view.preview_active = TRUE;
+	emfb->view.list_active = TRUE;
 
 	g_slist_free(emfb->view.ui_files);
 	emfb->view.ui_files = g_slist_append(NULL, EVOLUTION_UIDIR "/evolution-mail-global.xml");
@@ -861,25 +857,6 @@ emfb_list_built (MessageList *ml, EMFolderBrowser *emfb)
 	emfb->priv->idle_scroll_id = g_timeout_add_full (G_PRIORITY_LOW, 250, (GSourceFunc) scroll_idle_cb, emfb, NULL);
 }
 
-/* TODO: All this mess should sit directly on MessageList, but it would
-   need to become BonoboUIComponent aware ... */
-static void
-emfb_create_view_menus(EMFolderBrowser *emfb, BonoboUIComponent *uic)
-{
-	struct _EMFolderBrowserPrivate *p = emfb->priv;
-
-	if (emfb->view.view_instance == NULL)
-		return;
-
-	if (p->view_menus) {
-		g_object_unref(p->view_menus);
-		p->view_menus = NULL;
-	}
-
-	p->view_menus = gal_view_menus_new (emfb->view.view_instance);
-	gal_view_menus_apply(p->view_menus, uic, NULL);
-}
-
 static void
 emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri)
 {
@@ -950,10 +927,6 @@ emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri)
 		
 		if (emfv->list->cursor_uid == NULL && emfb->priv->list_built_id == 0)
 			p->list_built_id = g_signal_connect(emfv->list, "message_list_built", G_CALLBACK (emfb_list_built), emfv);
-		
-		/* NOTE: This relies on our parent class setting up emfv->view_instance */
-		if (emfv->uic)
-			emfb_create_view_menus (emfb, emfv->uic);
 	}
 
 	message_list_thaw(emfv->list);
@@ -962,8 +935,6 @@ emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri)
 static void
 emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act)
 {
-	struct _EMFolderBrowserPrivate *p = ((EMFolderBrowser *)emfv)->priv;
-
 	if (act) {
 		GConfClient *gconf;
 		gboolean state;
@@ -1038,21 +1009,12 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act)
 
 		if (((EMFolderBrowser *)emfv)->search)
 			e_search_bar_set_ui_component((ESearchBar *)((EMFolderBrowser *)emfv)->search, uic);
-
-		/* NOTE: This relies on our parent class setting up emfv->view_instance */
-		if (emfv->folder)
-			emfb_create_view_menus((EMFolderBrowser *)emfv, uic);
 	} else {
 		const BonoboUIVerb *v;
 		
 		for (v = &emfb_verbs[0]; v->cname; v++)
 			bonobo_ui_component_remove_verb(uic, v->cname);
 
-		if (p->view_menus) {
-			g_object_unref(p->view_menus);
-			p->view_menus = NULL;
-		}
-
 		if (((EMFolderBrowser *)emfv)->search)
 			e_search_bar_set_ui_component((ESearchBar *)((EMFolderBrowser *)emfv)->search, NULL);