Give camel_init() the correct path, and suddenly the mail module is USABLE!

svn path=/branches/kill-bonobo/; revision=37083

3 files changed, 3 insertions, 42 deletions

diff --git a/mail/e-mail-shell-view.c b/mail/e-mail-shell-view.c
index 3be18b9804..74870e59cb 100644
--- a/mail/e-mail-shell-view.c
+++ b/mail/e-mail-shell-view.c
@@ -21,23 +21,10 @@
 
 #include "e-mail-shell-view-private.h"
 
-enum {
-	PROP_0
-};
-
 GType e_mail_shell_view_type = 0;
 static gpointer parent_class;
 
 static void
-mail_shell_view_get_property (GObject *object,
-                              guint property_id,
-                              GValue *value,
-                              GParamSpec *pspec)
-{
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
 mail_shell_view_dispose (GObject *object)
 {
 	e_mail_shell_view_private_dispose (E_MAIL_SHELL_VIEW (object));
@@ -196,7 +183,6 @@ mail_shell_view_class_init (EMailShellViewClass *class,
 	g_type_class_add_private (class, sizeof (EMailShellViewPrivate));
 
 	object_class = G_OBJECT_CLASS (class);
-	object_class->get_property = mail_shell_view_get_property;
 	object_class->dispose = mail_shell_view_dispose;
 	object_class->finalize = mail_shell_view_finalize;
 	object_class->constructed = mail_shell_view_constructed;
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 24258ea8ca..9f53ae43c0 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -1649,20 +1649,6 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act)
 		char *sstate;
 		EMFolderBrowser *emfb = (EMFolderBrowser *) emfv;
 
-		gconf = mail_config_get_gconf_client ();
-
-		/* parent loads all ui files via ui_files */
-		emfb_parent->activate(emfv, uic, act);
-
-		bonobo_ui_component_add_verb_list_with_data(uic, emfb_verbs, emfv);
-		/* FIXME: finish */
-		/* (Pre)view pane size (do this first because it affects the
-	           preview settings - see folder_browser_set_message_preview()
-	           internals for details) */
-		g_signal_handler_block(emfb->vpane, emfb->priv->vpane_resize_id);
-		gtk_paned_set_position((GtkPaned *)emfb->vpane, gconf_client_get_int (gconf, emfb->priv->show_wide ? "/apps/evolution/mail/display/hpaned_size": "/apps/evolution/mail/display/paned_size", NULL));
-		g_signal_handler_unblock(emfb->vpane, emfb->priv->vpane_resize_id);
-
 		/* Stop button */
 		state = mail_msg_active((unsigned int)-1);
 		bonobo_ui_component_set_prop(uic, "/commands/MailStop", "sensitive", state?"1":"0", NULL);
@@ -1677,19 +1663,6 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act)
 		bonobo_ui_component_set_prop(uic, "/commands/HideDeleted", "state", state ? "1" : "0", NULL);
 		bonobo_ui_component_add_listener(uic, "HideDeleted", emfb_hide_deleted, emfv);
 		em_folder_view_set_hide_deleted(emfv, state); /* <- not sure if this optimal, but it'll do */
-
-		if (((EMFolderBrowser *)emfv)->search)
-			e_search_bar_set_ui_component((ESearchBar *)((EMFolderBrowser *)emfv)->search, uic);
-	} else {
-		const BonoboUIVerb *v;
-
-		for (v = &emfb_verbs[0]; v->cname; v++)
-			bonobo_ui_component_remove_verb(uic, v->cname);
-
-		if (((EMFolderBrowser *)emfv)->search)
-			e_search_bar_set_ui_component((ESearchBar *)((EMFolderBrowser *)emfv)->search, NULL);
-
-		emfb_parent->activate(emfv, uic, act);
 	}
 }
 
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 990c42ae5d..0e978ecdd0 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -43,6 +43,7 @@
 #include <camel/camel-filter-driver.h>
 #include <camel/camel-i18n.h>
 
+#include "e-util/e-util.h"
 #include "e-util/e-error.h"
 #include "e-util/e-util-private.h"
 #include "e-account-combo-box.h"
@@ -701,11 +702,11 @@ mail_session_init (EShellModule *shell_module)
 	const gchar *data_dir;
 
 	mail_shell_module = shell_module;
-	data_dir = e_shell_module_get_data_dir (shell_module);
 
 	shell = e_shell_module_get_shell (shell_module);
 	online_mode = e_shell_get_online_mode (shell);
 
+	data_dir = e_get_user_data_dir ();
 	if (camel_init (data_dir, TRUE) != 0)
 		exit (0);
 
@@ -715,6 +716,7 @@ mail_session_init (EShellModule *shell_module)
 	e_account_combo_box_set_session (session);  /* XXX Don't ask... */
 	e_account_writable(NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD); /* Init the EAccount Setup */
 
+	data_dir = e_shell_module_get_data_dir (shell_module);
 	camel_session_construct (session, data_dir);
 
 	gconf = mail_config_get_gconf_client ();