* modest_ui_new now returns ModestUI* instead of GObject

pmo-trunk-r385

diff --git a/src/gtk/modest-ui.c b/src/gtk/modest-ui.c
index d7dd880..5052e51 100644 (file)
--- a/src/gtk/modest-ui.c
+++ b/src/gtk/modest-ui.c
@@ -176,7 +176,7 @@ on_accounts_reloaded (ModestTnyAccountStore *account_store, gpointer user_data)
 }
 
 
 }
 
 

-GObject*
+ModestUI*

 modest_ui_new (ModestConf *modest_conf)
 {
        GObject *obj;
 modest_ui_new (ModestConf *modest_conf)
 {
        GObject *obj;

@@ -264,7 +264,7 @@ modest_ui_new (ModestConf *modest_conf)
        }
        g_slist_free(identities_list);
 
        }
        g_slist_free(identities_list);
 

-       return obj;
+       return MODEST_UI(obj);

 }
 
 
 }
 
 

diff --git a/src/hildon/modest-ui.c b/src/hildon/modest-ui.c
index 9999a1d..47599d9 100644 (file)
--- a/src/hildon/modest-ui.c
+++ b/src/hildon/modest-ui.c
@@ -177,7 +177,7 @@ on_accounts_reloaded (ModestTnyAccountStore *account_store, gpointer user_data)
 }
 
 
 }
 
 

-GObject*
+ModestUI*

 modest_ui_new (ModestConf *modest_conf)
 {
        GObject *obj;
 modest_ui_new (ModestConf *modest_conf)
 {
        GObject *obj;

@@ -251,7 +251,7 @@ modest_ui_new (ModestConf *modest_conf)
        g_slist_free(account_names_list);
        g_slist_free(identities_list);
 
        g_slist_free(account_names_list);
        g_slist_free(identities_list);
 

-       return obj;
+       return MODEST_UI(obj);

 }
 
 
 }
 
 

diff --git a/src/modest-ui.h b/src/modest-ui.h
index bae41f9..0e3ffa5 100644 (file)
--- a/src/modest-ui.h
+++ b/src/modest-ui.h
@@ -77,7 +77,7 @@ GType        modest_ui_get_type        (void) G_GNUC_CONST;
  *  
  * Returns: a new ModestUI, or NULL in case of error
  */
  *  
  * Returns: a new ModestUI, or NULL in case of error
  */

-GObject*     modest_ui_new             (ModestConf *modest_conf);
+ModestUI*     modest_ui_new             (ModestConf *modest_conf);

 
 
 /**
 
 
 /**

@@ -121,8 +121,13 @@ gboolean modest_ui_editor_window_set_subject_header(const gchar *subject, gpoint
 gboolean modest_ui_editor_window_set_body(const gchar *body, gpointer window_data);
 gboolean modest_ui_editor_window_update_attachments(gpointer window_data);
 
 gboolean modest_ui_editor_window_set_body(const gchar *body, gpointer window_data);
 gboolean modest_ui_editor_window_update_attachments(gpointer window_data);
 

-GtkContainer *modest_ui_new_viewer_window (ModestUI *modest_ui, GtkWidget *msg_view, TnyMsgIface *msg, gpointer *user_data);
+GtkContainer *modest_ui_new_viewer_window (ModestUI *modest_ui, GtkWidget *msg_view,
+                                          TnyMsgIface *msg, gpointer *user_data);

 
 

-G_END_DECLS
+/*
+ * the new API below
+ */
+GtkWidget *modest_ui_main_window (ModestUI *modest_ui);

 
 

+G_END_DECLS

 #endif /* __MODEST_UI_H__ */
 #endif /* __MODEST_UI_H__ */