modest-msg-window => modest-edit-msg-window
authorDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Tue, 25 Jul 2006 14:39:20 +0000 (14:39 +0000)
committerDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Tue, 25 Jul 2006 14:39:20 +0000 (14:39 +0000)
pmo-trunk-r421

src/gtk2/Makefile.am
src/gtk2/modest-edit-msg-window.c [new file with mode: 0644]
src/gtk2/modest-edit-msg-window.h [new file with mode: 0644]
src/gtk2/modest-msg-window.c [deleted file]
src/gtk2/modest-msg-window.h [deleted file]

index a5e3c19..5e874cb 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Makefile.am
-# Time-stamp: <2006-07-20 15:52:05 (djcb)>
+# Time-stamp: <2006-07-25 08:52:20 (djcb)>
 #
 #
 # use Automake 'trick' ==> convenience static libraries, which
@@ -28,8 +28,8 @@ libmodest_ui_la_SOURCES=              \
        modest-account-view-window.h  \
        modest-account-assistant.c    \
        modest-account-assistant.h    \
-       modest-msg-window.c           \
-       modest-msg-window.h
+       modest-edit-msg-window.c      \
+       modest-edit-msg-window.h
 
 LDADD = \
        $(MODEST_GSTUFF_LIBS) \
diff --git a/src/gtk2/modest-edit-msg-window.c b/src/gtk2/modest-edit-msg-window.c
new file mode 100644 (file)
index 0000000..5811350
--- /dev/null
@@ -0,0 +1,185 @@
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "modest-edit-msg-window.h"
+#include <widgets/modest-msg-view.h>
+#include <modest-widget-memory.h>
+
+/* 'private'/'protected' functions */
+static void                        modest_edit_msg_window_class_init   (ModestEditMsgWindowClass *klass);
+static void                        modest_edit_msg_window_init         (ModestEditMsgWindow *obj);
+static void                        modest_edit_msg_window_finalize     (GObject *obj);
+
+/* list my signals */
+enum {
+       /* MY_SIGNAL_1, */
+       /* MY_SIGNAL_2, */
+       LAST_SIGNAL
+};
+
+typedef struct _ModestEditMsgWindowPrivate ModestEditMsgWindowPrivate;
+struct _ModestEditMsgWindowPrivate {
+
+       ModestConf *conf;
+       
+       GtkWidget  *msg_body;
+       GtkWidget  *to_field, *cc_field, *bcc_field,
+                  *subject_field;
+};
+#define MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
+                                                    MODEST_TYPE_EDIT_MSG_WINDOW, \
+                                                    ModestEditMsgWindowPrivate))
+/* globals */
+static GtkWindowClass *parent_class = NULL;
+
+/* uncomment the following if you have defined any signals */
+/* static guint signals[LAST_SIGNAL] = {0}; */
+
+GType
+modest_edit_msg_window_get_type (void)
+{
+       static GType my_type = 0;
+       if (!my_type) {
+               static const GTypeInfo my_info = {
+                       sizeof(ModestEditMsgWindowClass),
+                       NULL,           /* base init */
+                       NULL,           /* base finalize */
+                       (GClassInitFunc) modest_edit_msg_window_class_init,
+                       NULL,           /* class finalize */
+                       NULL,           /* class data */
+                       sizeof(ModestEditMsgWindow),
+                       1,              /* n_preallocs */
+                       (GInstanceInitFunc) modest_edit_msg_window_init,
+               };
+               my_type = g_type_register_static (GTK_TYPE_WINDOW,
+                                                 "ModestEditMsgWindow",
+                                                 &my_info, 0);
+       }
+       return my_type;
+}
+
+static void
+modest_edit_msg_window_class_init (ModestEditMsgWindowClass *klass)
+{
+       GObjectClass *gobject_class;
+       gobject_class = (GObjectClass*) klass;
+
+       parent_class            = g_type_class_peek_parent (klass);
+       gobject_class->finalize = modest_edit_msg_window_finalize;
+
+       g_type_class_add_private (gobject_class, sizeof(ModestEditMsgWindowPrivate));
+
+       /* signal definitions go here, e.g.: */
+/*     signals[MY_SIGNAL_1] = */
+/*             g_signal_new ("my_signal_1",....); */
+/*     signals[MY_SIGNAL_2] = */
+/*             g_signal_new ("my_signal_2",....); */
+/*     etc. */
+}
+
+static void
+modest_edit_msg_window_init (ModestEditMsgWindow *obj)
+{
+       GtkWidget *to_button, *cc_button, *bcc_button, *subject_label; 
+       GtkWidget *header_table;
+       GtkWidget *main_vbox;
+       
+       ModestEditMsgWindowPrivate *priv;
+       priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj);
+
+       to_button     = gtk_button_new_with_label (_("To..."));
+       cc_button     = gtk_button_new_with_label (_("Cc..."));
+       bcc_button    = gtk_button_new_with_label (_("Bcc..."));
+       subject_label = gtk_label_new (_("Subject:"));
+       
+       priv->to_field      = gtk_entry_new_with_max_length (40);
+       priv->cc_field      = gtk_entry_new_with_max_length (40);
+       priv->bcc_field     = gtk_entry_new_with_max_length (40);
+       priv->subject_field = gtk_entry_new_with_max_length (40);
+
+       header_table = gtk_table_new (4,2, FALSE);
+       gtk_table_attach_defaults (GTK_TABLE(header_table), to_button,     0,1,0,1);
+       gtk_table_attach_defaults (GTK_TABLE(header_table), cc_button,     0,1,1,2);
+       gtk_table_attach_defaults (GTK_TABLE(header_table), bcc_button,    0,1,2,3);
+       gtk_table_attach_defaults (GTK_TABLE(header_table), subject_label, 0,1,3,4);
+       gtk_table_attach_defaults (GTK_TABLE(header_table), priv->to_field,     1,2,0,1);
+       gtk_table_attach_defaults (GTK_TABLE(header_table), priv->cc_field,     1,2,1,2);
+       gtk_table_attach_defaults (GTK_TABLE(header_table), priv->bcc_field,    1,2,2,3);
+       gtk_table_attach_defaults (GTK_TABLE(header_table), priv->subject_field,1,2,3,4);
+
+       priv->msg_body = gtk_text_view_new ();
+       
+       main_vbox = gtk_vbox_new  (FALSE, 6);
+
+       gtk_box_pack_start (GTK_BOX(main_vbox), header_table, TRUE, TRUE, 6);
+       gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 6);
+
+       gtk_widget_show_all (GTK_WIDGET(main_vbox));
+       gtk_container_add (GTK_CONTAINER(obj), main_vbox);
+}
+
+static void
+modest_edit_msg_window_finalize (GObject *obj)
+{
+       ModestEditMsgWindowPrivate *priv;
+
+       priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj);
+
+       g_object_unref (G_OBJECT(priv->conf));
+       priv->conf = NULL;
+
+       G_OBJECT_CLASS(parent_class)->finalize (obj);
+
+}
+
+
+GtkWidget*
+modest_edit_msg_window_new (ModestConf *conf, ModestEditType type,
+                           TnyMsgIface *msg)
+{
+       GObject *obj;
+       ModestEditMsgWindowPrivate *priv;
+
+       g_return_val_if_fail (conf, NULL);
+       g_return_val_if_fail (type >= 0 && type < MODEST_EDIT_TYPE_NUM, NULL);
+       g_return_val_if_fail (!(type==MODEST_EDIT_TYPE_NEW && msg), NULL); 
+       g_return_val_if_fail (!(type!=MODEST_EDIT_TYPE_NEW && !msg), NULL); 
+       
+       
+       obj = g_object_new(MODEST_TYPE_EDIT_MSG_WINDOW, NULL);
+       priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj);
+
+       g_object_ref (G_OBJECT(conf));
+       priv->conf = conf;
+       
+       modest_widget_memory_restore_settings (priv->conf, GTK_WIDGET(priv->msg_body),
+                                              "modest-edit-msg-body");
+       return GTK_WIDGET (obj);
+}
diff --git a/src/gtk2/modest-edit-msg-window.h b/src/gtk2/modest-edit-msg-window.h
new file mode 100644 (file)
index 0000000..e17a76a
--- /dev/null
@@ -0,0 +1,84 @@
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __MODEST_EDIT_MSG_WINDOW_H__
+#define __MODEST_EDIT_MSG_WINDOW_H__
+
+#include <gtk/gtk.h>
+#include <tny-msg-iface.h>
+#include <modest-conf.h>
+#include <glib/gi18n.h>
+
+
+G_BEGIN_DECLS
+
+/* convenience macros */
+#define MODEST_TYPE_EDIT_MSG_WINDOW             (modest_edit_msg_window_get_type())
+#define MODEST_EDIT_MSG_WINDOW(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_EDIT_MSG_WINDOW,ModestEditMsgWindow))
+#define MODEST_EDIT_MSG_WINDOW_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_EDIT_MSG_WINDOW,GtkWindow))
+#define MODEST_IS_EDIT_MSG_WINDOW(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_EDIT_MSG_WINDOW))
+#define MODEST_IS_EDIT_MSG_WINDOW_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_EDIT_MSG_WINDOW))
+#define MODEST_EDIT_MSG_WINDOW_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_EDIT_MSG_WINDOW,ModestEditMsgWindowClass))
+
+typedef struct _ModestEditMsgWindow      ModestEditMsgWindow;
+typedef struct _ModestEditMsgWindowClass ModestEditMsgWindowClass;
+
+struct _ModestEditMsgWindow {
+        GtkWindow parent;
+       /* insert public members, if any */
+};
+
+struct _ModestEditMsgWindowClass {
+       GtkWindowClass parent_class;
+       /* insert signal callback declarations, eg. */
+       /* void (* my_event) (ModestEditMsgWindow* obj); */
+};
+
+
+enum _ModestEditType {
+       MODEST_EDIT_TYPE_NEW,
+       MODEST_EDIT_TYPE_REPLY,
+       MODEST_EDIT_TYPE_FORWARD,
+       MODEST_EDIT_TYPE_VIEW,
+       
+       MODEST_EDIT_TYPE_NUM
+};
+typedef enum _ModestEditType ModestEditType;
+
+
+/* member functions */
+GType        modest_edit_msg_window_get_type    (void) G_GNUC_CONST;
+
+GtkWidget*   modest_edit_msg_window_new         (ModestConf *conf,
+                                                ModestEditType type,
+                                                TnyMsgIface *msg);
+G_END_DECLS
+
+#endif /* __MODEST_EDIT_MSG_WINDOW_H__ */
+
diff --git a/src/gtk2/modest-msg-window.c b/src/gtk2/modest-msg-window.c
deleted file mode 100644 (file)
index 7b8c008..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Copyright (c) 2006, Nokia Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the Nokia Corporation nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <widgets/modest-msg-view.h>
-#include "modest-msg-window.h"
-
-/* 'private'/'protected' functions */
-static void                   modest_msg_window_class_init    (ModestMsgWindowClass *klass);
-static void                   modest_msg_window_init          (ModestMsgWindow *obj);
-static void                   modest_msg_window_finalize      (GObject *obj);
-
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
-};
-
-typedef struct _ModestMsgWindowPrivate ModestMsgWindowPrivate;
-struct _ModestMsgWindowPrivate {
-       /* my private members go here, eg. */
-       /* gboolean frobnicate_mode; */
-};
-#define MODEST_MSG_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                               MODEST_TYPE_MSG_WINDOW, \
-                                               ModestMsgWindowPrivate))
-/* globals */
-static GtkWindowClass *parent_class = NULL;
-
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
-GType
-modest_msg_window_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestMsgWindowClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_msg_window_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestMsgWindow),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_msg_window_init,
-               };
-               my_type = g_type_register_static (GTK_TYPE_WINDOW,
-                                                 "ModestMsgWindow",
-                                                 &my_info, 0);
-       }
-       return my_type;
-}
-
-static void
-modest_msg_window_class_init (ModestMsgWindowClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_msg_window_finalize;
-
-       g_type_class_add_private (gobject_class, sizeof(ModestMsgWindowPrivate));
-
-       /* signal definitions go here, e.g.: */
-/*     signals[MY_SIGNAL_1] = */
-/*             g_signal_new ("my_signal_1",....); */
-/*     signals[MY_SIGNAL_2] = */
-/*             g_signal_new ("my_signal_2",....); */
-/*     etc. */
-}
-
-static void
-modest_msg_window_init (ModestMsgWindow *obj)
-{
-       GtkWidget *to_button, *cc_button, *bcc_button, *subject_label;
-       GtkWidget *to_field, *cc_field, *bcc_field, *subject_field;
-       GtkWidget *header_table;
-       GtkWidget *main_vbox;
-       GtkWidget *msg_field;
-       
-       ModestMsgWindowPrivate *priv;
-       priv = MODEST_MSG_WINDOW_GET_PRIVATE(obj);
-
-       to_button     = gtk_button_new_with_label (_("To..."));
-       cc_button     = gtk_button_new_with_label (_("Cc..."));
-       bcc_button    = gtk_button_new_with_label (_("Bcc..."));
-       subject_label = gtk_label_new (_("Subject:"));
-       
-       to_field      = gtk_entry_new ();
-       cc_field      = gtk_entry_new ();
-       bcc_field     = gtk_entry_new ();
-       subject_field = gtk_entry_new ();
-
-       header_table = gtk_table_new (4,2, FALSE);
-       gtk_table_attach_defaults (GTK_TABLE(header_table), to_button,     0,1,0,1);
-       gtk_table_attach_defaults (GTK_TABLE(header_table), cc_button,     0,1,1,2);
-       gtk_table_attach_defaults (GTK_TABLE(header_table), bcc_button,    0,1,2,3);
-       gtk_table_attach_defaults (GTK_TABLE(header_table), subject_label, 0,1,3,4);
-
-       gtk_table_attach_defaults (GTK_TABLE(header_table), to_field,      1,2,0,1);
-       gtk_table_attach_defaults (GTK_TABLE(header_table), cc_field,      1,2,1,2);
-       gtk_table_attach_defaults (GTK_TABLE(header_table), bcc_field,     1,2,2,3);
-       gtk_table_attach_defaults (GTK_TABLE(header_table), subject_field, 1,2,3,4);
-
-       msg_field = modest_msg_view_new (NULL);
-       
-       main_vbox = gtk_vbox_new  (FALSE, 6);
-
-       gtk_box_pack_start (GTK_BOX(main_vbox), header_table, FALSE, FALSE, 6);
-       gtk_box_pack_start (GTK_BOX(main_vbox), msg_field,    TRUE, TRUE, 6);
-
-       gtk_widget_show_all (GTK_WIDGET(main_vbox));
-       
-       gtk_container_add (GTK_CONTAINER(obj), main_vbox);
-}
-
-static void
-modest_msg_window_finalize (GObject *obj)
-{
-/*     free/unref instance resources here */
-}
-
-GtkWidget*
-modest_msg_window_new  (ModestMsgWindowType type, TnyMsgIface *msg)
-{
-       GObject *obj;
-       
-       g_return_val_if_fail ((type >= 1 && type <= MODEST_MSG_WINDOW_TYPE_NUM), NULL);
-       
-       obj = g_object_new(MODEST_TYPE_MSG_WINDOW, NULL);
-
-       return GTK_WIDGET (obj);
-}
-
diff --git a/src/gtk2/modest-msg-window.h b/src/gtk2/modest-msg-window.h
deleted file mode 100644 (file)
index cc280a9..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright (c) 2006, Nokia Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the Nokia Corporation nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __MODEST_MSG_WINDOW_H__
-#define __MODEST_MSG_WINDOW_H__
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <tny-msg-iface.h>
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_MSG_WINDOW             (modest_msg_window_get_type())
-#define MODEST_MSG_WINDOW(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_MSG_WINDOW,ModestMsgWindow))
-#define MODEST_MSG_WINDOW_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_MSG_WINDOW,GtkWindow))
-#define MODEST_IS_MSG_WINDOW(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_MSG_WINDOW))
-#define MODEST_IS_MSG_WINDOW_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_MSG_WINDOW))
-#define MODEST_MSG_WINDOW_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_MSG_WINDOW,ModestMsgWindowClass))
-
-typedef struct _ModestMsgWindow      ModestMsgWindow;
-typedef struct _ModestMsgWindowClass ModestMsgWindowClass;
-
-struct _ModestMsgWindow {
-        GtkWindow parent;
-       /* insert public members, if any */
-};
-
-struct _ModestMsgWindowClass {
-       GtkWindowClass parent_class;
-       /* insert signal callback declarations, eg. */
-       /* void (* my_event) (ModestMsgWindow* obj); */
-};
-
-
-enum _ModestMsgWindowType {
-       MODEST_MSG_WINDOW_TYPE_VIEW,
-       MODEST_MSG_WINDOW_TYPE_NEW,
-       MODEST_MSG_WINDOW_TYPE_REPLY,
-       MODEST_MSG_WINDOW_TYPE_FORWARD,
-
-       MODEST_MSG_WINDOW_TYPE_NUM
-};
-
-typedef enum _ModestMsgWindowType ModestMsgWindowType;
-
-
-/* member functions */
-GType        modest_msg_window_get_type    (void) G_GNUC_CONST;
-
-GtkWidget*   modest_msg_window_new         (ModestMsgWindowType type,
-                                           TnyMsgIface *msg);
-
-G_END_DECLS
-
-#endif /* __MODEST_MSG_WINDOW_H__ */
-