* smalll cleanup

[modest] / src / modest-viewer-window.c

diff --git a/src/modest-viewer-window.c b/src/modest-viewer-window.c
index 342a7aa..dc9036c 100644 (file)
--- a/src/modest-viewer-window.c
+++ b/src/modest-viewer-window.c
@@ -1,9 +1,35 @@
-/* modest-viewer-window.c */
+/* 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.
+ */
 
-/* insert (c)/licensing information) */
 
 #include "modest-ui.h"
-#include "modest-tny-msg-view.h"
+#include "widgets/modest-msg-view.h"
 #include "modest-viewer-window.h"
 
 
@@ -19,8 +45,8 @@ enum {
 
 typedef struct _ModestViewerWindowPrivate ModestViewerWindowPrivate;
 struct _ModestViewerWindowPrivate {
-       ModestTnyMsgView *msg_view;
-       gpointer user_data;
+       ModestMsgView *msg_view;
+       gpointer      user_data;
 };
 #define MODEST_VIEWER_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                   MODEST_TYPE_VIEWER_WINDOW, \
@@ -108,7 +134,7 @@ modest_viewer_window_new (ModestUI *ui, TnyMsgIface *msg)
        self = G_OBJECT(g_object_new(MODEST_TYPE_VIEWER_WINDOW, NULL));
        priv = MODEST_VIEWER_WINDOW_GET_PRIVATE(self);
 
-       msg_view = modest_tny_msg_view_new(msg, FALSE);
+       msg_view = modest_msg_view_new(msg);
 
        data = NULL;
        w = GTK_WIDGET(modest_ui_new_viewer_window(ui, msg_view, msg, &data));
@@ -119,7 +145,7 @@ modest_viewer_window_new (ModestUI *ui, TnyMsgIface *msg)
 
        gtk_container_add(GTK_CONTAINER(self), w);
        priv->user_data = data;
-       priv->msg_view = MODEST_TNY_MSG_VIEW(msg_view);
+       priv->msg_view = MODEST_MSG_VIEW(msg_view);
 
        return GTK_WIDGET(self);
 }
@@ -129,27 +155,26 @@ modest_viewer_window_new (ModestUI *ui, TnyMsgIface *msg)
  * return user defined data from a ModestViewerWindow instance
  * like e.g. a refernce to a GladeXML*
  */
-gpointer modest_viewer_window_get_data(ModestViewerWindow *viewer_win)
+gpointer
+modest_viewer_window_get_data(ModestViewerWindow *viewer_win)
 {
        ModestViewerWindowPrivate *priv;
 
-       if (!viewer_win) {
-               return NULL;
-       }
+       g_return_val_if_fail (viewer_win, NULL);
+
        priv = MODEST_VIEWER_WINDOW_GET_PRIVATE(viewer_win);
 
        return priv->user_data;
 }
 
 
-ModestTnyMsgView
-*modest_viewer_window_get_tiny_msg_view(ModestViewerWindow *viewer_win)
+ModestMsgView*
+modest_viewer_window_get_tiny_msg_view(ModestViewerWindow *viewer_win)
 {
        ModestViewerWindowPrivate *priv;
 
-       if (!viewer_win) {
-               return NULL;
-       }
+       g_return_val_if_fail (viewer_win, NULL);
+       
        priv = MODEST_VIEWER_WINDOW_GET_PRIVATE(viewer_win);
 
        return priv->msg_view;