From f5a5b7f93359c6e7ff078ffe604b54c8d8169dda Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 17 Jul 2006 12:18:07 +0000 Subject: [PATCH] * modest_ui_new now returns ModestUI* instead of GObject pmo-trunk-r385 --- src/gtk/modest-ui.c | 4 ++-- src/hildon/modest-ui.c | 4 ++-- src/modest-ui.h | 11 ++++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/gtk/modest-ui.c b/src/gtk/modest-ui.c index d7dd880..5052e51 100644 --- 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; @@ -264,7 +264,7 @@ modest_ui_new (ModestConf *modest_conf) } 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 --- 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; @@ -251,7 +251,7 @@ modest_ui_new (ModestConf *modest_conf) 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 --- 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 */ -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); -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__ */ -- 1.7.9.5