1 files changed, 85 insertions, 299 deletions

diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c
index cb6afb659d..84214888a9 100644
--- a/capplet/settings/mail-view.c
+++ b/capplet/settings/mail-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -36,9 +36,6 @@
 
 #include "mail-settings-view.h"
 
-#if HAVE_ANERLEY
-#  include "mail-people-view.h"
-#endif
 #include "anjal-mail-view.h"
 #include "mail-account-view.h"
 #include "mail/em-folder-tree.h"
@@ -61,19 +58,17 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-#undef MV_NEW_TAB
-
 G_DEFINE_TYPE (MailView, mail_view, ANJAL_MAIL_VIEW_TYPE)
 #ifndef ANJAL_SETTINGS
-static MailConvView * mv_switch_message_view (MailView *mv, const char *uri);
+static MailConvView * mv_switch_message_view (MailView *mv, const gchar *uri);
 #endif
 
 #define REALIGN_NODES(list,pdata)	if (list->data != pdata) { \
 						list = g_list_remove (list, pdata);	\
 						list = g_list_prepend (list, pdata); \
 					}
-						
-void anjal_shell_view_restore_state (EShellView *view, const char *uri);
+
+void anjal_shell_view_restore_state (EShellView *view, const gchar *uri);
 
 static void
 mail_view_init (MailView  *shell)
@@ -91,17 +86,17 @@ mail_view_finalize (GObject *object)
 {
 	MailView *shell = (MailView *)object;
 	MailViewPrivate *priv = shell->priv;
-	
+
 	g_list_free (priv->children);
 	g_free (priv);
-	
+
 	G_OBJECT_CLASS (mail_view_parent_class)->finalize (object);
 }
 
 static void
-mv_set_folder_uri (AnjalMailView *mv, const char *uri)
+mv_set_folder_uri (AnjalMailView *mv, const gchar *uri)
 {
-#ifndef ANJAL_SETTINGS	
+#ifndef ANJAL_SETTINGS
 	mail_view_set_folder_uri ((MailView *)mv, uri);
 #endif
 }
@@ -112,11 +107,11 @@ static void set_folder_tree (AnjalMailView *mv, EMFolderTree *tree)
 }
 
 static void
-set_search (AnjalMailView *mv, const char *search)
+set_search (AnjalMailView *mv, const gchar *search)
 {
-#ifndef ANJAL_SETTINGS	
+#ifndef ANJAL_SETTINGS
 	mail_view_set_search ((MailView *)mv, search);
-#endif	
+#endif
 }
 
 static void
@@ -142,125 +137,48 @@ mail_view_class_init (MailViewClass *klass)
 
 };
 
-#ifdef MV_NEW_TAB
-static void
-mv_new_page (GtkButton *w, MailView *mv)
-{
-	mail_view_add_page (mv, MAIL_VIEW_FOLDER, NULL);
-	gtk_notebook_set_current_page (mv, g_list_length (mv->priv->children)-1);
-}
-#endif
-
 static void
 mv_switch (GtkNotebook     *notebook,GtkNotebookPage *page, guint page_num, gpointer user_data)
 {
 	MailView *shell = (MailView *)notebook;
 	MailViewPrivate *priv = shell->priv;
 	MailViewChild *curr = priv->current_view;
+	MailViewChild *child;
+	gint current_child = gtk_notebook_get_current_page (notebook);
 
 	curr->flags &= ~MAIL_VIEW_HOLD_FOCUS;
-	
-#ifdef MV_NEW_TAB
-	if (page_num == g_list_length(priv->children) && shell->priv->new) {
-		mail_view_add_page (shell, MAIL_VIEW_FOLDER, NULL);
-		gtk_notebook_set_current_page (shell, g_list_length (shell->priv->children)-1);
-	} else {
-#endif		 
-		MailViewChild *child;
-		int current_child = gtk_notebook_get_current_page (notebook);
-		
-		child = (MailViewChild *)gtk_notebook_get_nth_page (notebook, current_child);
-		 
-		priv->current_view = child;
-		REALIGN_NODES(shell->priv->children,child);
-
-#ifndef ANJAL_SETTINGS		
-		if (child->type == MAIL_VIEW_COMPOSER)
-			 mail_composer_view_activate ((MailComposerView *)child, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE);
-		else if (child->type == MAIL_VIEW_MESSAGE)
-			 mail_conv_view_activate ((MailConvView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
-		else if (child->type == MAIL_VIEW_FOLDER)  {
-			 mail_folder_view_activate ((MailFolderView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, TRUE);
-			 anjal_shell_view_restore_state (shell->shell_view, child->uri);
-		} else if (child->type == MAIL_VIEW_ACCOUNT)
-			mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
-		else if (child->type == MAIL_VIEW_SETTINGS)
-			mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE);
-#else
-		if (child->type == MAIL_VIEW_ACCOUNT)
-			mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
-		else if (child->type == MAIL_VIEW_SETTINGS)
-			mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE);
-#endif
-#if HAVE_ANERLEY
-		else if (child->type == MAIL_VIEW_PEOPLE)
-			mail_people_view_activate ((MailPeopleView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE);
-#endif
-
-		
-		
-#ifdef MV_NEW_TAB		
-	}
-#endif	
-}
 
+	child = (MailViewChild *)gtk_notebook_get_nth_page (notebook, current_child);
 
-#ifdef MV_NEW_TAB
-static gboolean
-mv_btn_expose (GtkWidget *w, GdkEventExpose *event, MailView *mv)
-{
-	GdkPixbuf *img = g_object_get_data (w, "pbuf");
-	cairo_t *cr = gdk_cairo_create (w->window);
-	int wid = w->allocation.width;
-	int heig = w->allocation.height;
-	cairo_save (cr);
-	gdk_cairo_set_source_pixbuf (cr, img, event->area.x-4, event->area.y-5);
-	cairo_paint(cr);
-	cairo_restore(cr);
-	cairo_destroy (cr);
+	priv->current_view = child;
+	REALIGN_NODES(shell->priv->children,child);
 
-	return TRUE;
+#ifndef ANJAL_SETTINGS
+	if (child->type == MAIL_VIEW_COMPOSER)
+		 mail_composer_view_activate ((MailComposerView *)child, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE);
+	else if (child->type == MAIL_VIEW_MESSAGE)
+		 mail_conv_view_activate ((MailConvView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
+	else if (child->type == MAIL_VIEW_FOLDER)  {
+		 mail_folder_view_activate ((MailFolderView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, TRUE);
+		 anjal_shell_view_restore_state (shell->shell_view, child->uri);
+	} else if (child->type == MAIL_VIEW_ACCOUNT)
+		mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
+	else if (child->type == MAIL_VIEW_SETTINGS)
+		mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE);
+#else
+	if (child->type == MAIL_VIEW_ACCOUNT)
+		mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
+	else if (child->type == MAIL_VIEW_SETTINGS)
+		mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE);
+#endif
 }
 
 static void
-mv_new_tab_button (MailView *shell)
-{
-	int position;
-	GtkWidget *label = gtk_button_new (), *img;
-	GdkPixbuf *pbuf = e_icon_factory_get_icon ("gtk-add", E_ICON_SIZE_MENU);
-	GtkWidget *box = gtk_hbox_new (FALSE, 0);
-	int w,h;
-	
-	img = gtk_image_new_from_pixbuf (pbuf);
-	g_object_set_data (img, "pbuf", pbuf);
-	g_signal_connect (img, "expose-event", mv_btn_expose, shell);
-	g_signal_connect (label, "clicked", G_CALLBACK(mv_new_page), shell);
-	gtk_button_set_image (label, img);
-	gtk_icon_size_lookup_for_settings (gtk_widget_get_settings(label) , GTK_ICON_SIZE_MENU, &w, &h);
-	gtk_widget_set_size_request (label, w+2, h+2);
-
-	gtk_button_set_relief(label, GTK_RELIEF_NONE);
-	gtk_button_set_focus_on_click (label, FALSE);
-	gtk_widget_set_tooltip_text (label, _("New Tab"));
-	gtk_widget_show_all (label);
-	gtk_widget_show (box);
-	shell->priv->new = box;
-	position = gtk_notebook_append_page (shell, box, label);
-	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (shell), box, FALSE);
-        gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (shell), box, FALSE);
-	
-}
-#endif
-
-void
 mail_view_construct (MailView *shell)
 {
 	gtk_notebook_set_show_tabs ((GtkNotebook *)shell, TRUE);
 	gtk_notebook_set_scrollable ((GtkNotebook *)shell, TRUE);
 	gtk_notebook_popup_disable ((GtkNotebook *)shell);
-#ifdef MV_NEW_TAB	
-	mv_new_tab_button (shell);
-#endif	
 	g_signal_connect_after (shell, "switch-page", G_CALLBACK(mv_switch), shell);
 }
 
@@ -269,42 +187,14 @@ mail_view_new ()
 {
 	MailView *shell = g_object_new (MAIL_VIEW_TYPE, NULL);
 	mail_view_construct (shell);
-	
-	return shell;
-}
-
-static void
-mv_message_shown (MailViewChild *mfv, MailView *mv)
-{
-	GtkWidget *arr;
-	
-	if (!mv->slider)
-		return;
-
-	arr = g_object_get_data ((GObject *)mv->slider, "right-arrow");
-	//gtk_widget_hide (mv->folder_tree);
-	gtk_widget_show (arr);
-	gtk_widget_show (mv->slider);
-}
-
-static int
-list_data_pos (GList *list, gpointer data)
-{
-	int i=-1;
-	while (list) {
-		i++;
-		if (list->data == data)
-			return i;
-		list = list->next;
-	}
 
-	return i;
+	return shell;
 }
 
-static int
+static gint
 mv_get_page_number (GtkNotebook *note, GtkWidget *widget)
 {
-	int i, total;
+	gint i, total;
 
 	total = gtk_notebook_get_n_pages (note);
 	for (i=0; i<total; i++) {
@@ -318,15 +208,15 @@ mv_get_page_number (GtkNotebook *note, GtkWidget *widget)
 static void
 mv_close_mcv (MailViewChild *mfv, MailView *mv)
 {
-	int n = mv_get_page_number ((GtkNotebook *)mv, (GtkWidget *)mfv);
-	int pos = gtk_notebook_get_current_page ((GtkNotebook *)mv);
+	gint n = mv_get_page_number ((GtkNotebook *)mv, (GtkWidget *)mfv);
+	gint pos = gtk_notebook_get_current_page ((GtkNotebook *)mv);
 	MailViewChild *child;
 	gboolean removing_viewed = FALSE;
 
 	if (g_list_length(mv->priv->children) == 1)
 		return;
 
-#ifndef ANJAL_SETTINGS	
+#ifndef ANJAL_SETTINGS
 	/* Make sure atleast one folder view is open. */
 	if (mfv->type == MAIL_VIEW_FOLDER) {
 		GList *tmp = mv->priv->children;
@@ -348,12 +238,12 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv)
 		if (!mail_composer_view_can_quit((MailComposerView *)mfv))
 			return;
 	}
-#endif	
+#endif
 
 	g_signal_handlers_block_by_func(mv, mv_switch, mv);
 	gtk_notebook_remove_page ((GtkNotebook *)mv, n);
 	g_signal_handlers_unblock_by_func(mv, mv_switch, mv);
-	
+
 	if (mfv == mv->priv->children->data)
 		removing_viewed = TRUE;
 	mv->priv->children  = g_list_remove (mv->priv->children, mfv);
@@ -366,7 +256,7 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv)
 	pos = mv_get_page_number ((GtkNotebook *)mv, (GtkWidget *)child);
 	gtk_notebook_set_current_page ((GtkNotebook *)mv, pos);
 
-#ifndef ANJAL_SETTINGS	
+#ifndef ANJAL_SETTINGS
 	if (child->type == MAIL_VIEW_COMPOSER)
 		 mail_composer_view_activate ((MailComposerView *)child, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE);
 	else if (child->type == MAIL_VIEW_MESSAGE)
@@ -374,7 +264,6 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv)
 	else if (child->type == MAIL_VIEW_FOLDER) {
 		 mail_folder_view_activate ((MailFolderView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, TRUE);
 		 anjal_shell_view_restore_state ((EShellView *)mv->shell_view, child->uri);
-		 //mail_search_set_state (mv->priv->search, ((MailFolderView *)child)->search_str, ((MailFolderView *)child)->search_state);
 	} else if (child->type == MAIL_VIEW_ACCOUNT)
 		mail_account_view_activate ((MailAccountView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 	else if (child->type == MAIL_VIEW_SETTINGS)
@@ -384,22 +273,17 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv)
 		mail_account_view_activate ((MailAccountView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 	else if (child->type == MAIL_VIEW_SETTINGS)
 		mail_settings_view_activate ((MailSettingsView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
-	
-#endif	
-#if HAVE_ANERLEY
-	else if (child->type == MAIL_VIEW_PEOPLE)
-		mail_people_view_activate ((MailPeopleView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
-#endif
 
+#endif
 }
 
 #ifndef ANJAL_SETTINGS
 static void
-mv_message_new (MailFolderView *mfv, gpointer data, char *umid, MailView *mv)
+mv_message_new (MailFolderView *mfv, gpointer data, gchar *umid, MailView *mv)
 {
 	MailConvView *conv = (MailConvView *)mv_switch_message_view(mv, umid);
 	*(MailConvView **)data = conv;
-	
+
 	if (conv)
 		conv->uri = g_strdup(umid);
 
@@ -410,7 +294,6 @@ static void
 mv_search_set (MailFolderView *mfv, MailView *mv)
 {
 	anjal_shell_view_restore_state (mv->shell_view, ((MailViewChild *)mfv)->uri);
-	 //mail_search_set_state (mv->priv->search, mfv->search_str, mfv->search_state);
 }
 
 static void
@@ -426,7 +309,7 @@ mail_view_add_folder (MailView *mv, gpointer data, gboolean block)
 	MailFolderView *mfv = mail_folder_view_new ();
 	gint position = 0;
 	mail_folder_view_set_folder_pane (mfv, mv->folder_tree);
-	if(!block)
+	if (!block)
 		mv->priv->current_view = (MailViewChild *)mfv;
 	mv->priv->children = block ? g_list_append(mv->priv->children,  mfv) :  g_list_prepend (mv->priv->children,  mfv);
 	position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mfv, mfv->tab_label);
@@ -464,17 +347,17 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block)
 	if (!block)
 		mv->priv->current_view = (MailViewChild *)mcv;
 	mv->priv->children = block ? g_list_append(mv->priv->children,  mcv) :  g_list_prepend (mv->priv->children,  mcv);
-	
-	if (!special) 
-		position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mcv->tab_label); 
+
+	if (!special)
+		position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mcv->tab_label);
 	else {
-		int position = gtk_notebook_get_current_page ((GtkNotebook *)mv);
+		gint position = gtk_notebook_get_current_page ((GtkNotebook *)mv);
 		gtk_notebook_insert_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mcv->tab_label, position+1);
 	}
 
 	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE);
         gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE);
-	if (!block)	
+	if (!block)
 		 gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
 	gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)mcv, FALSE, FALSE, 0);
 	if (!block)
@@ -483,7 +366,6 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block)
 	g_signal_connect (mcv, "view-close", G_CALLBACK(mv_close_mcv), mv);
 	g_signal_connect (mcv, "message-shown", G_CALLBACK(mv_message_shown), mv);
 
-	//mv_message_shown ((MailViewChild *)mcv, mv);
 	return (MailViewChild *)mcv;
 }
 
@@ -495,10 +377,10 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block)
 
 	gtk_widget_show ((GtkWidget *)mcv);
 	mcv->type = MAIL_VIEW_MESSAGE;
-	if(!block)
+	if (!block)
 		mv->priv->current_view = (MailViewChild *)mcv;
 	mv->priv->children = block ? g_list_append(mv->priv->children,  mcv) :  g_list_prepend (mv->priv->children,  mcv);
-	
+
 	position = gtk_notebook_get_current_page ((GtkNotebook *)mv);
 	gtk_notebook_insert_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mail_conv_view_get_tab_widget(mcv), position+1);
 	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE);
@@ -511,7 +393,7 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block)
 
 	g_signal_connect (mcv, "view-close", G_CALLBACK(mv_close_mcv), mv);
 	g_signal_connect (mcv, "message-shown", G_CALLBACK(mv_message_shown), mv);
-	
+
 	return (MailViewChild *)mcv;
 }
 
@@ -528,9 +410,9 @@ mail_view_add_settings (MailView *mv, gpointer data, gboolean block)
 {
 	MailSettingsView *msv  = mail_settings_view_new ();
 	gint position = 0;
-	
+
 	gtk_widget_show ((GtkWidget *)msv);
-	if(!block)
+	if (!block)
 		mv->priv->current_view = (MailViewChild *)msv;
 	mv->priv->children = block ? g_list_append(mv->priv->children,  msv) :  g_list_prepend (mv->priv->children,  msv);
 
@@ -541,69 +423,29 @@ mail_view_add_settings (MailView *mv, gpointer data, gboolean block)
         gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE);
 	if (!block)
 		gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
-	gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)msv, FALSE, FALSE, 0);
-	if(!block)
+	if (!block)
 		 mail_settings_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
 
 	return (MailViewChild *)msv;
 }
 
-#if HAVE_ANERLEY
-void
-mail_view_switch_to_people (MailView* mv, MailViewChild *mpv)
-{
-	GList *tmp = mv->priv->children;
-	int position = 0;
-
-	position = mv_get_page_number(mv, mpv);
-	REALIGN_NODES(mv->priv->children,mpv);
-	gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
-	mail_people_view_activate ((MailPeopleView *)mpv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
-}
-#endif
-
 void
 mail_view_switch_to_settings (MailView* mv, MailViewChild *mpv)
 {
-	int position = 0;
+	gint position = 0;
 
 	position = mv_get_page_number((GtkNotebook *)mv, (GtkWidget *)mpv);
-	REALIGN_NODES(mv->priv->children,mpv);	
+	REALIGN_NODES(mv->priv->children,mpv);
 	gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
 	mail_settings_view_activate ((MailSettingsView *)mpv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
 }
- 
-#if HAVE_ANERLEY
-static MailViewChild *
-mail_view_add_people (MailView *mv, gpointer data, gboolean block)
-{
-	MailPeopleView *msv  = mail_people_view_new ();
-	gint position = 0;
-	
-	gtk_widget_show ((GtkWidget *)msv);
-	if (!block)
-		mv->priv->current_view = (MailViewChild *)msv;
-	mv->priv->children = block ? g_list_append(mv->priv->children,  msv) :  g_list_prepend (mv->priv->children,  msv);
-	position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)msv, mail_people_view_get_tab_widget(msv));
-	g_signal_connect (msv, "view-close", G_CALLBACK(mv_close_mcv), mv);
-	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE);
-        gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE);
-	if (!block)
-		gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
-	gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)msv, FALSE, FALSE, 0);
-	if(!block)
-		 mail_people_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
-
-	return (MailViewChild *)msv;
-}
-#endif
 
 static MailViewChild *
 mail_view_add_account (MailView *mv, gpointer data, gboolean block)
 {
 	MailAccountView *msv  = mail_account_view_new (data);
 	gint position = 0;
-	
+
 	gtk_widget_show ((GtkWidget *)msv);
 	if (!block)
 		mv->priv->current_view = (MailViewChild *)msv;
@@ -612,10 +454,9 @@ mail_view_add_account (MailView *mv, gpointer data, gboolean block)
 	g_signal_connect_after (msv, "view-close", G_CALLBACK(mv_close_mcv), mv);
 	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE);
         gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE);
-	if(!block)
+	if (!block)
 		gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
-	gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)msv, FALSE, FALSE, 0);
-	if(!block)
+	if (!block)
 		 mail_account_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 
 	return (MailViewChild *)msv;
@@ -626,14 +467,14 @@ mail_view_add_page (MailView *mv, guint16 type, gpointer data)
 {
 	MailViewChild *child = NULL, *current_child;
 	gboolean block = FALSE;
-	
+
 	current_child = mv->priv->current_view;
 	if (current_child && (current_child->flags & MAIL_VIEW_HOLD_FOCUS))
 		 block = TRUE;
-	
+
 	g_signal_handlers_block_by_func(mv, mv_switch, mv);
-	switch (type){
-#ifndef ANJAL_SETTINGS		
+	switch (type) {
+#ifndef ANJAL_SETTINGS
 	case MAIL_VIEW_FOLDER:
 		 child = mail_view_add_folder (mv, data, block);
 		break;
@@ -644,47 +485,37 @@ mail_view_add_page (MailView *mv, guint16 type, gpointer data)
 	case MAIL_VIEW_MESSAGE:
 		 child = mail_view_add_message (mv, data, block);
 		break;
-#endif		
+#endif
 	case MAIL_VIEW_SETTINGS:
 		 child = mail_view_add_settings (mv, data, block);
 		break;
-#if HAVE_ANERLEY
-	case MAIL_VIEW_PEOPLE:
-		 child = mail_view_add_people (mv, data, block);
-		break;
-#endif
 	case MAIL_VIEW_ACCOUNT:
 		 child = mail_view_add_account (mv, data, block);
-		break;	
+		break;
 	}
 	gtk_widget_grab_focus((GtkWidget *)child);
 	child->type = type;
-#ifdef MV_NEW_TAB	
-	gtk_notebook_reorder_child (mv, mv->priv->new, -1);
-	gtk_notebook_set_current_page (mv, g_list_length (mv->priv->children)-1);
-#endif 	
 	g_signal_handlers_unblock_by_func(mv, mv_switch, mv);
 
 	child->flags = 0;
-	
+
 	return child;
 }
 
 #ifndef ANJAL_SETTINGS
 static void
-mv_switch_folder_view (MailView *mv, const char *uri)
+mv_switch_folder_view (MailView *mv, const gchar *uri)
 {
-	 int i=0, len = g_list_length(mv->priv->children);
+	 gint i=0, len = g_list_length(mv->priv->children);
 	 GList *tmp = mv->priv->children;
 	 while (i<len) {
 		  MailViewChild *child = (MailViewChild *)gtk_notebook_get_nth_page ((GtkNotebook *)mv, i);
 
 		  if (child->type == MAIL_VIEW_FOLDER && !strcmp (uri, child->uri)) {
-			   if(child != mv->priv->current_view) {
+			if (child != mv->priv->current_view) {
 				gtk_notebook_set_current_page ((GtkNotebook *)mv, i);
-			   	//REALIGN_NODES(mv->priv->children, child);
-			   }
-			   return;
+			}
+			return;
 		  }
 		  i++;
 		  tmp = tmp->next;
@@ -695,9 +526,9 @@ mv_switch_folder_view (MailView *mv, const char *uri)
 }
 
 static MailConvView *
-mv_switch_message_view (MailView *mv, const char *uri)
+mv_switch_message_view (MailView *mv, const gchar *uri)
 {
-	 int i=0;
+	 gint i=0;
 	 GList *tmp = mv->priv->children;
 	 while (tmp) {
 		  MailViewChild *child = tmp->data;
@@ -715,11 +546,10 @@ mv_switch_message_view (MailView *mv, const char *uri)
 }
 
 void
-mail_view_set_folder_uri (MailView *mv, const char *uri)
+mail_view_set_folder_uri (MailView *mv, const gchar *uri)
 {
-	
+
 	 mv_switch_folder_view (mv, uri);
-	//mail_folder_view_set_folder_uri (mv->priv->current_view, uri);
 }
 
 void
@@ -738,7 +568,6 @@ mail_view_show_list (MailView *mv)
 	 else if (child->type == MAIL_VIEW_FOLDER)
 		  mail_folder_view_show_list ((MailFolderView *)mv->priv->current_view);
 
-		  
 }
 #endif
 void
@@ -777,36 +606,10 @@ mail_view_set_folder_tree_widget (MailView *mv, GtkWidget *tree)
 	mv->folder_tree = tree;
 }
 
-#if 0
-static gboolean
-mv_tree_click_cb (GtkWidget *w, GdkEventButton *event, MailView *mv)
-{
-	 if ((event->button == 1 && event->type == GDK_2BUTTON_PRESS) || event->button == 2) {
-		  GtkTreeSelection *selection;
-		  GtkTreePath *tree_path;
-		  
-		  if (!gtk_tree_view_get_path_at_pos ((GtkTreeView *)w, (int) event->x, (int) event->y, &tree_path, NULL, NULL, NULL))
-			   return FALSE;
-		  mail_view_add_page (mv, MAIL_VIEW_FOLDER, NULL);
-		  gtk_notebook_set_current_page ((GtkNotebook *)mv, g_list_length (mv->priv->children)-1);
-		  selection = gtk_tree_view_get_selection ((GtkTreeView *)w);
-		  gtk_tree_selection_unselect_path (selection, tree_path);
-		  gtk_tree_selection_select_path(selection, tree_path);
-		  gtk_tree_view_set_cursor ((GtkTreeView *)w, tree_path, NULL, FALSE);
-
-
-		  return TRUE;
-	 }
-	 return FALSE;
-}
-#endif
-
 void
 mail_view_set_folder_tree (MailView *mv, GtkWidget *tree)
 {
 	mv->tree = tree;
-	//em_folder_tree_set_skip_double_click ((EMFolderTree *)tree, FALSE);
-	//g_signal_connect ((GObject *)em_folder_tree_get_tree_view((EMFolderTree *)tree), "button-press-event", G_CALLBACK(mv_tree_click_cb), mv);
 }
 
 void
@@ -821,46 +624,29 @@ mail_view_set_sort_by  (MailView *mv, GtkWidget *button)
 	 mv->sort_by = button;;
 }
 
-static void
-mv_spinner_show (MailView *mv, gboolean show)
-{
-	 GtkWidget *spinner = g_object_get_data ((GObject *)mv->check_mail, "spinner");
-	 GtkWidget *icon = g_object_get_data ((GObject *)mv->check_mail, "icon");
-
-	 if(show) {
-		  gtk_widget_show (spinner);
-		  gtk_widget_hide(icon);
-		  gtk_button_set_relief ((GtkButton *)mv->check_mail, GTK_RELIEF_NORMAL);
-		  
-	 } else {
-		  gtk_widget_show (icon);
-		  gtk_widget_hide(spinner);
-		  gtk_button_set_relief ((GtkButton *)mv->check_mail, GTK_RELIEF_NONE);
-	 }
-}
-
+#ifndef ANJAL_SETTINGS
 static void
 mv_spinner_done (CamelFolder *f, gpointer data)
 {
 	MailView *mv = (MailView *)data;
 	 mv_spinner_show (mv, FALSE);
 }
-#ifndef ANJAL_SETTINGS
+
 void
 mail_view_check_mail(MailView *mv, gboolean deep)
 {
 	 MailViewChild *child = (MailViewChild *)mv->priv->current_view;
-	 
+
 	 if (child && child->type == MAIL_VIEW_FOLDER) {
 		  mail_folder_view_check_mail ((MailFolderView *)child);
 		  CamelFolder *folder;
-		  
+
 		  if ((folder = em_folder_tree_get_selected_folder ((EMFolderTree *)mv->tree)) != NULL) {
 			   mv_spinner_show (mv, TRUE);
 			   mail_refresh_folder(folder, mv_spinner_done, mv);
 		  }
 	 }
-	
+
 	if (deep) {
 		em_utils_clear_get_password_canceled_accounts_flag ();
 		mail_send_receive (NULL);
@@ -883,7 +669,7 @@ mail_view_save (MailView *mv)
 }
 
 void
-mail_view_set_search (MailView *mv, const char *search)
+mail_view_set_search (MailView *mv, const gchar *search)
 {
 	MailViewChild *child = (MailViewChild *)mv->priv->current_view;