[anjal] Fix compiler issues

[Srinivasa Ragavan <sragavan src gnome org>]

commit aae5e3964d3a5e8f3967c6b930ab6870d9f78cc5
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Tue May 12 00:07:09 2009 +0530

    Fix compiler issues
---
 src/mail-composer-view.c |   16 +++++++++++++---
 src/mail-message-view.c  |   22 +++++++++++++++++-----
 src/mail-message-view.h  |    1 -
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/mail-composer-view.c b/src/mail-composer-view.c
index 62cfca7..40a1c98 100644
--- a/src/mail-composer-view.c
+++ b/src/mail-composer-view.c
@@ -29,7 +29,6 @@
 
 #include "mail-view.h"
 #include "mail-composer-view.h"
-#include "e-msg-composer.h"
 
 struct  _MailComposerViewPrivate {
 	GtkWidget *box;
@@ -46,6 +45,8 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (MailComposerView, mail_composer_view, GTK_TYPE_VBOX)
 
+struct _EMsgComposer* em_utils_compose_lite_new_message (char *);
+
 static void
 mail_composer_view_init (MailComposerView  *shell)
 {
@@ -98,7 +99,7 @@ mcv_btn_expose (GtkWidget *w, GdkEventExpose *event, MailComposerView *mcv)
 }
 
 static void
-composer_close_cb (EMsgComposer *composer, MailComposerView *mcv)
+composer_close_cb (struct _EMsgComposer *composer, MailComposerView *mcv)
 {
 	/*Emit view-close signal.*/
 	//g_object_unref (composer);
@@ -110,7 +111,7 @@ void
 mail_composer_view_construct (MailComposerView *shell)
 {
 	MailComposerViewPrivate *priv = shell->priv;
-	EMsgComposer *composer;
+	struct _EMsgComposer *composer;
 
 	GtkWidget *scroller, *close_button, *w, *img, *box, *tmp;
 	GdkPixbuf *icon;
@@ -172,3 +173,12 @@ mail_composer_view_activate (MailComposerView *mfv, GtkWidget *folder_tree, GtkW
 	 gtk_widget_set_sensitive (check_mail, act);
 	 gtk_widget_set_sensitive (sort_by, act);
 }
+
+#ifndef HACK_TO_COMPILE
+
+void
+em_composer_prefs_new_signature (GtkWindow *parent,
+                                 gboolean html_mode)
+{
+}
+#endif
diff --git a/src/mail-message-view.c b/src/mail-message-view.c
index 19131ee..35fc9ee 100644
--- a/src/mail-message-view.c
+++ b/src/mail-message-view.c
@@ -37,11 +37,11 @@
 #endif
 #include "mail/mail-session.h"
 #include "mail/mail-ops.h"
-#include "e-msg-composer.h"
 #include "misc/e-spinner.h"
 #include <gdk/gdkkeysyms.h>
 #include "e-util/e-icon-factory.h"
 #include "mail/em-composer-utils.h"
+#include "mail-shell.h"
 
 extern char *scolor_norm;
 extern char *scolor_sel;
@@ -67,8 +67,20 @@ struct  _MailMessageViewPrivate {
 	char *normal[2];
 };
 
+typedef enum {
+	E_COMPOSER_HEADER_FROM,
+	E_COMPOSER_HEADER_TO,
+	E_COMPOSER_HEADER_CC,
+	E_COMPOSER_HEADER_BCC,
+	E_COMPOSER_HEADER_ACTIONS,
+	E_COMPOSER_HEADER_SUBJECT,
+	E_COMPOSER_NUM_HEADERS
+} EComposerHeaderType;
+
 G_DEFINE_TYPE (MailMessageView, mail_message_view, GTK_TYPE_VBOX)
 
+struct _EComposerHeaderTable *e_msg_composer_get_header_table (struct _EMsgComposer *);
+	
 enum {
 	MESSAGE_SELECTED,
 	MESSAGE_REMOVED,
@@ -350,7 +362,7 @@ discard_composer_cb (GtkWidget *w, MailMessageView *mmv)
 }
 
 static void
-mmv_mail_send (EMsgComposer *composer, MailMessageView *mmv)
+mmv_mail_send (struct _EMsgComposer *composer, MailMessageView *mmv)
 {
 	gtk_widget_hide (mmv->frame);
 	gtk_widget_hide (mmv->comp_view);
@@ -391,16 +403,16 @@ static void
 construct_reply_composer (MailMessageView *mmv, int mode)
 {
 	MailEditor *editor;
-	EComposerHeaderTable *table;
+	struct _EComposerHeaderTable *table;
 	WebKitWebView *web_view;
 
 	e_msg_composer_set_lite();
 
-	if (!E_IS_MSG_COMPOSER (mmv->composer)) {
+	if (mmv->composer) {
 		GtkWidget *box = gtk_vbox_new (FALSE, 0);
 		gtk_widget_show(box);
 		
-		mmv->composer = (EMsgComposer *)em_utils_reply_to_message (mmv->priv->folder, mmv->priv->uid, mmv->priv->msg, mode, NULL);
+		mmv->composer = (struct _EMsgComposer *)em_utils_reply_to_message (mmv->priv->folder, mmv->priv->uid, mmv->priv->msg, mode, NULL);
 		mmv->comp_view = g_object_get_data(mmv->composer,"vbox");
 		gtk_widget_reparent (mmv->comp_view, box);
 		gtk_widget_set_size_request (mmv->comp_view, -1, 400);	
diff --git a/src/mail-message-view.h b/src/mail-message-view.h
index ed35d9a..dd6ee40 100644
--- a/src/mail-message-view.h
+++ b/src/mail-message-view.h
@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 #include "em-format-webkit-display.h"
-#include "e-msg-composer.h"
 #include "mail-view.h"
 #include <camel/camel-stream.h>