[anjal] Fix warnings

[Srinivasa Ragavan <sragavan src gnome org>]

commit 33e4b2313678321f464c5be218dfe5f1c0960fa8
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Wed Jun 17 18:21:27 2009 +0530

    Fix warnings

 src/em-format-mail-display.c |   11 ++++++-----
 src/em-format-mail.c         |   18 +++++++++---------
 src/mail-message-view.c      |   10 +++++-----
 src/mail-message-view.h      |    3 +--
 4 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/src/em-format-mail-display.c b/src/em-format-mail-display.c
index 45650cf..bd689b2 100644
--- a/src/em-format-mail-display.c
+++ b/src/em-format-mail-display.c
@@ -1516,7 +1516,7 @@ efhd_attachment_button(EMFormatMail *efh, GtkWidget *eb, EMFormatMailPObject *po
 	printf("%s %p %p\n", pobject->classid, info, pobject);
 	if (!info || info->forward) {
 		g_warning ("unable to expand the attachment\n");
-		return TRUE;
+		return NULL;
 	}
 
 	attachment = info->attachment;
@@ -1622,10 +1622,10 @@ efhd_add_bar (EMFormatMail *efh,
 
 	widget = e_mail_attachment_bar_new ();
 	if (efhd->priv->attachment_area) {
-		gtk_box_pack_start (efhd->priv->attachment_area, widget, FALSE, FALSE, 0);
+		gtk_box_pack_start ((GtkBox *)efhd->priv->attachment_area, widget, FALSE, FALSE, 0);
 		gtk_widget_show (efhd->priv->attachment_area);
 	} else
-		gtk_box_pack_start (eb, widget, FALSE, FALSE, 0);
+		gtk_box_pack_start ((GtkBox *)eb, widget, FALSE, FALSE, 0);
 	efhd->priv->attachment_view = widget;
 	gtk_widget_hide (widget);
 
@@ -1665,7 +1665,8 @@ efhd_message_add_bar (EMFormat *efh,
 static void
 efhd_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const gchar *mime_type, const EMFormatHandler *handle)
 {
-	gchar *classid, *text, *html;
+	gchar *classid;
+	//gchar *text, *html;
 	struct _attach_puri *info;
 	EMFormatMailPObject *pobj;
 
@@ -1927,7 +1928,7 @@ preview_message_exec (struct _preview_message_msg *m)
 	EMFormatMailPObject *pobj = m->pobject;
 	pobj->view = (gpointer) pobj->func(pobj->format, (gpointer)pobj->body, pobj);
 	if (pobj->view) {
-		pobj->stream = mail_message_view_create_webstream (mail_message_view_create_webview(((EMFormatMail *)pobj->format)->msg_view, pobj->view), pobj->view);
+		pobj->stream = mail_message_view_create_webstream (mail_message_view_create_webview((MailMessageView *)((EMFormatMail *)pobj->format)->msg_view, pobj->view), pobj->view);
 		gtk_widget_show (pobj->view);
 	}
 	e_flag_set (m->done);
diff --git a/src/em-format-mail.c b/src/em-format-mail.c
index 3791d34..3a15e92 100644
--- a/src/em-format-mail.c
+++ b/src/em-format-mail.c
@@ -269,8 +269,8 @@ em_format_mail_get_type(void)
 			sizeof(EMFormatMail), 0,
 			(GInstanceInitFunc)efh_init
 		};
-		const gchar *base_directory = e_get_user_data_dir ();
-		gchar *path;
+		//const gchar *base_directory = e_get_user_data_dir ();
+		//gchar *path;
 
 		/* Trigger creation of mail component. */
 		mail_component_peek ();
@@ -890,7 +890,7 @@ efh_text_html(EMFormatMail *efh, CamelStream *stream, CamelMimePart *part, EMFor
 {
 	const gchar *location;
 	/* This is set but never used for anything */
-	EMFormatPURI *puri;
+	//EMFormatPURI *puri;
 	gchar *cid = NULL;
 
 	camel_stream_printf (stream,
@@ -1245,7 +1245,7 @@ struct _format_msg {
 
 	EMFormatMail *format;
 	EMFormat *format_source;
-	EMHTMLStream *estream;
+	CamelStream *estream;
 	CamelFolder *folder;
 	gchar *uid;
 	CamelMimeMessage *message;
@@ -1431,8 +1431,8 @@ efh_format_timeout(struct _format_msg *m)
 		p->last_part = NULL;
 	} else {
 		efh->state = EM_FORMAT_MAIL_STATE_RENDERING;
-		m->estream = mail_message_view_create_webstream(mail_message_view_create_webview (efh->msg_view, efh->body), efh->body);
-		efh->header_stream = mail_message_view_create_webstream(mail_message_view_create_webview (efh->msg_view, efh->wheaders), efh->wheaders);
+		m->estream = (CamelStream *)mail_message_view_create_webstream((gpointer)mail_message_view_create_webview (efh->msg_view, efh->body), efh->body);
+		efh->header_stream = mail_message_view_create_webstream((gpointer)mail_message_view_create_webview (efh->msg_view, efh->wheaders), efh->wheaders);
 
 #if 0
 		if (p->last_part != m->message) {
@@ -1446,8 +1446,8 @@ efh_format_timeout(struct _format_msg *m)
 #endif
 		if (p->last_part == m->message) {
 			mail_message_view_set_web_flags (m->estream,
-						  WEB_BEGIN_KEEP_SCROLL | WEB_BEGIN_KEEP_IMAGES
-						  | WEB_BEGIN_BLOCK_UPDATES | WEB_BEGIN_BLOCK_IMAGES);
+						  MAIL_BEGIN_KEEP_SCROLL | MAIL_BEGIN_KEEP_IMAGES
+						  | MAIL_BEGIN_BLOCK_UPDATES | MAIL_BEGIN_BLOCK_IMAGES);
 #if 0			
 			em_html_stream_set_flags (m->estream,
 						  GTK_HTML_BEGIN_KEEP_SCROLL | GTK_HTML_BEGIN_KEEP_IMAGES
@@ -2200,7 +2200,7 @@ efh_busy(EMFormat *emf)
 void
 em_format_mail_set_message_view (EMFormatMail *efw, struct _MailMessageView *mmv, GtkWidget *body, GtkWidget *headers)
 {
-	efw->msg_view = mmv;
+	efw->msg_view = (GtkWidget *)mmv;
 	efw->body = body;
 	efw->wheaders = headers;
 }
diff --git a/src/mail-message-view.c b/src/mail-message-view.c
index 0d3fa47..6dd468b 100644
--- a/src/mail-message-view.c
+++ b/src/mail-message-view.c
@@ -190,7 +190,7 @@ mmv_message_opened(CamelFolder *folder, const char *uid, CamelMimeMessage *msg,
 	mail_indicate_new_mail (FALSE);
 	//gtk_widget_hide (shell->priv->table_headers);
 	//gtk_widget_show (shell->priv->html_headers);
-	em_format_mail_set_message_view ((EMFormatWebKit *)shell->efwd, shell, shell->body, shell->priv->html_headers);
+	em_format_mail_set_message_view ((EMFormatMail *)shell->efwd, shell, shell->body, shell->priv->html_headers);
 	em_format_format((EMFormat *)shell->efwd, folder, uid, msg); 
 	shell->priv->msg = msg;
 	gtk_widget_hide (shell->priv->spinner);
@@ -1160,7 +1160,7 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
 	gtk_widget_show(tmp);
 	gtk_box_pack_start ((GtkBox *)GTK_BOX (mmview->main_header), tmp, FALSE, FALSE, 3);
 
-	mmview->priv->table_headers = table;
+	mmview->priv->table_headers = (GtkWidget *)table;
 	gtk_box_pack_start ((GtkBox *)GTK_BOX (mmview->main_header), GTK_WIDGET (table), TRUE, TRUE, 3);
 	mmview->priv->html_headers = gtk_vbox_new (FALSE, 0);
 	gtk_box_pack_start ((GtkBox *)GTK_BOX (mmview->main_header), GTK_WIDGET (mmview->priv->html_headers), TRUE, TRUE, 3);
@@ -1251,7 +1251,7 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
 	gtk_widget_hide (mmview->priv->html_headers);
 	/* Default: Body would be hidden */
 	mmview->body = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (mmview->body, mmview->priv->attach_area, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *)mmview->body, mmview->priv->attach_area, FALSE, FALSE, 0);
 
 	//gtk_box_pack_start (header_row, mmview->priv->spinner, FALSE, FALSE, 0);
 	//gtk_widget_hide (mmview->priv->spinner);
@@ -1325,9 +1325,9 @@ void
 mail_message_view_construct (MailMessageView *mmview)
 {
 	GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
-	mmview->efwd = em_format_mail_display_new ();
+	mmview->efwd = (GtkWidget *)em_format_mail_display_new ();
 	((EMFormat *)mmview->efwd)->show_photo = FALSE;
-	em_format_mail_display_set_attachment_pane (mmview->efwd, vbox);
+	em_format_mail_display_set_attachment_pane ((EMFormatMailDisplay *)mmview->efwd, vbox);
 	em_format_set_session ((EMFormat *)mmview->efwd, session);
 	gtk_box_set_spacing ((GtkBox *)mmview, 0);
 	mmview->priv->attach_area = vbox;
diff --git a/src/mail-message-view.h b/src/mail-message-view.h
index 1b630ff..b705492 100644
--- a/src/mail-message-view.h
+++ b/src/mail-message-view.h
@@ -24,7 +24,6 @@
 #define _MAIL_MESSAGE_VIEW_H_
 
 #include <gtk/gtk.h>
-#include "em-format-webkit-display.h"
 #include "mail-view.h"
 #include <camel/camel-stream.h>
 
@@ -60,7 +59,7 @@ typedef struct _MailMessageView {
 	GtkWidget *pop_out;
 
 	MailMessageViewPrivate *priv;
-	EMFormatWebKitDisplay *efwd;
+	GtkWidget *efwd;
 } MailMessageView;
 
 typedef struct _MailMessageViewClass {