* updated test case, code cleanup, documentation fixes

[modest] / src / modest-ui.h

diff --git a/src/modest-ui.h b/src/modest-ui.h
index 55fa6a1..57c811c 100644 (file)
--- a/src/modest-ui.h
+++ b/src/modest-ui.h
@@ -1,11 +1,39 @@
-/* modest-ui.h */
-/* 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.
+ */
 
 #ifndef __MODEST_UI_H__
 #define __MODEST_UI_H__
 
 #include <glib-object.h>
+#include <gtk/gtkcontainer.h>
 #include "modest-conf.h"
+#include "widgets/modest-msg-view.h"
 
 G_BEGIN_DECLS
 
@@ -41,48 +69,21 @@ struct _ModestUIClass {
  */
 GType        modest_ui_get_type        (void) G_GNUC_CONST;
 
-
-
 /**
  * modest_ui_new:
- * @modest_conf: a ModestConf instance 
  *  
  * Returns: a new ModestUI, or NULL in case of error
  */
-GObject*     modest_ui_new             (ModestConf *modest_conf);
+ModestUI*     modest_ui_new             (void);
 
 
 /**
- * modest_ui_show_main_window:
- * @ui: a ModestUI instance 
+ * modest_ui_main_window:
+ * @modest_ui: a ModestUI instance 
  *  
- * Returns: TRUE if succeeded, FALSE otherwise
- * 
+ * Returns: a new main window, or NULL in case of error
  */
-gboolean     modest_ui_show_main_window (ModestUI *ui);
-
-
-/**
- * modest_ui_show_new_edit_window:
- * @ui: a ModestUI instance 
- * @to: people to send this to, ';' separated
- * @cc: people send carbon-copies (cc), ';' separated
- * @bcc people send blind-carbon-copies (bcc),';' separated
- * @subject: the subject of the message
- * @body: the body text of the message
- * @att: a list with the filepaths for attachments
- *  
- * Returns: TRUE if succeeded, FALSE otherwise
- */
-gboolean     modest_ui_show_edit_window (ModestUI *ui,
-                                        const gchar* to,
-                                        const gchar* cc,
-                                        const gchar* bcc,
-                                        const gchar* subject,
-                                        const gchar* body,
-                                        const GSList* att);
+GtkWidget *modest_ui_main_window (ModestUI *modest_ui);
 
 G_END_DECLS
-
 #endif /* __MODEST_UI_H__ */
-