* don't depend on hildon when it's not there

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

diff --git a/src/modest-editor-window.c b/src/modest-editor-window.c
index 8ab01f2..4dd7595 100644 (file)
--- a/src/modest-editor-window.c
+++ b/src/modest-editor-window.c
@@ -1,6 +1,31 @@
-/* modest-editor-window.c */
-
-/* insert (c)/licensing information) */
+/* 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-ui.h"
 #include "modest-editor-window.h"
@@ -192,10 +217,10 @@ gboolean modest_editor_window_set_to_header(ModestEditorWindow *edit_win, const
 gboolean modest_editor_window_set_cc_header(ModestEditorWindow *edit_win, const gchar *cc)
 {
        ModestEditorWindowPrivate *priv;
-
        
        if (!edit_win)
                return FALSE;
+
        priv = MODEST_EDITOR_WINDOW_GET_PRIVATE(edit_win);
 
        return modest_ui_editor_window_set_cc_header(cc, priv->user_data);
@@ -204,7 +229,6 @@ gboolean modest_editor_window_set_cc_header(ModestEditorWindow *edit_win, const
 gboolean modest_editor_window_set_bcc_header(ModestEditorWindow *edit_win, const gchar *bcc)
 {
        ModestEditorWindowPrivate *priv;
-
        
        if (!edit_win)
                return FALSE;
@@ -216,7 +240,6 @@ gboolean modest_editor_window_set_bcc_header(ModestEditorWindow *edit_win, const
 gboolean modest_editor_window_set_subject_header(ModestEditorWindow *edit_win, const gchar *subject)
 {
        ModestEditorWindowPrivate *priv;
-
        
        if (!edit_win)
                return FALSE;
@@ -229,7 +252,6 @@ gboolean modest_editor_window_set_body(ModestEditorWindow *edit_win, const gchar
 {
        ModestEditorWindowPrivate *priv;
 
-       
        if (!edit_win)
                return FALSE;
        priv = MODEST_EDITOR_WINDOW_GET_PRIVATE(edit_win);
@@ -238,7 +260,8 @@ gboolean modest_editor_window_set_body(ModestEditorWindow *edit_win, const gchar
 }
 
 
-gboolean modest_editor_window_attach_file(ModestEditorWindow *edit_win, ModestTnyAttachment *attachment)
+gboolean modest_editor_window_attach_file(ModestEditorWindow *edit_win,
+                                         ModestTnyAttachment *attachment)
 {
        ModestEditorWindowPrivate *priv;
 
@@ -246,9 +269,8 @@ gboolean modest_editor_window_attach_file(ModestEditorWindow *edit_win, ModestTn
                return FALSE;
        priv = MODEST_EDITOR_WINDOW_GET_PRIVATE(edit_win);
        
-       priv->attachments = g_list_append(
-                                                       priv->attachments, 
-                                                       attachment);
+       priv->attachments = g_list_append(priv->attachments, 
+                                         attachment);
        
        return modest_ui_editor_window_update_attachments(priv->user_data);
 }
@@ -266,6 +288,7 @@ GList * modest_editor_window_set_attachments(ModestEditorWindow *edit_win, const
        priv->attachments = g_list_copy((GList *)attachments);
        for (pos = priv->attachments ; pos ; pos = pos->next )
                g_object_ref(pos->data);
+
        return priv->attachments;
 }