From b0bf67c67967f06a50ab68befeb8d52d34001e0b Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 27 Jun 2006 10:36:21 +0000 Subject: [PATCH] * Change deprecated HildonApp/HildonAppView to HildonProgram/HildonWindow. * Hacked hildon support for editor window (still not fully functional). * Several minor changes and updates. * Remove some files from the packages. pmo-trunk-r347 --- debian/files | 2 +- debian/modest.substvars | 2 +- debian/rules | 2 +- src/hildon/modest-ui-glade.h | 3 + src/hildon/modest-ui-main-view.c | 53 ++++++----- src/hildon/modest-ui-message-editor.c | 98 +++++++++++++------- src/hildon/modest-ui.c | 3 +- src/hildon/modest.glade | 164 +++++++++++++++------------------ src/modest-editor-window.c | 31 +++---- src/modest-editor-window.h | 5 +- 10 files changed, 192 insertions(+), 171 deletions(-) diff --git a/debian/files b/debian/files index e22655e..a21db8c 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -modest_0.0.9-1_i386.deb unknown optional +modest_0.0.9-1_armel.deb user/unknown optional diff --git a/debian/modest.substvars b/debian/modest.substvars index 2f081fa..d374a97 100644 --- a/debian/modest.substvars +++ b/debian/modest.substvars @@ -1 +1 @@ -shlibs:Depends=gtkhtml0, hildon-libs0 (>= 0.12.18-1), libart-2.0-2 (>= 2.3.16), libatk1.0-0 (>= 1.9.0), libaudiofile0 (>= 0.2.3-4), libc6 (>= 2.3.5-1), libdbus-1-2 (>= 0.61), libdbus-glib-1-2 (>= 0.61), libexpat1 (>= 1.95.8), libfontconfig1 (>= 2.3.2-1osso7), libfreetype6 (>= 2.1.10-1osso1), libgconf2-6 (>= 2.6.4.14), libglade2-0 (>= 1:2.3.6), libglib2.0-0 (>= 2.8.6-1osso1), libgtk2.0-0 (>= 2:2.6.10-1.osso8), libmatchbox1 (>= 1.7-1), libpango1.0-0 (>= 1.8.1), libpng12-0 (>= 1.2.8rel), libx11-6 | xlibs (>> 4.1.0), libxau0, libxext6 | xlibs (>> 4.1.0), libxft2 (>= 2.1.6-1osso10), libxml2 (>= 2.6.16), libxrender1, osso-esd, zlib1g (>= 1:1.2.1) +shlibs:Depends=gtkhtml0, hildon-libs0 (>= 0.12.18-1), libart-2.0-2 (>= 2.3.16), libatk1.0-0 (>= 1.9.0), libaudiofile0 (>= 0.2.3-4), libc6 (>= 2.3.5-1), libcamel (>= 1.4.1), libdbus-1-2 (>= 0.61), libdbus-glib-1-2 (>= 0.61), libedataserver (>= 1.4.1), libexpat1 (>= 1.95.8), libfontconfig1 (>= 2.3.2-1osso7), libfreetype6 (>= 2.1.10-1osso1), libgconf2-6 (>= 2.6.4.14), libglade2-0 (>= 1:2.3.6), libglib2.0-0 (>= 2.8.6-1osso1), libgtk2.0-0 (>= 2:2.6.10-1.osso8), libmatchbox1 (>= 1.7-1), libosso1 (>= 1.11-1), libpango1.0-0 (>= 1.8.1), libpng12-0 (>= 1.2.8rel), libx11-6 | xlibs (>> 4.1.0), libxau0, libxext6 | xlibs (>> 4.1.0), libxft2 (>= 2.1.6-1osso10), libxml2 (>= 2.6.16), libxrender1, osso-esd, zlib1g (>= 1:1.2.1) diff --git a/debian/rules b/debian/rules index e4d3310..8e88ca5 100755 --- a/debian/rules +++ b/debian/rules @@ -89,7 +89,7 @@ binary-arch: build install # dh_installinit # dh_installcron # dh_installinfo - dh_installman +# dh_installman dh_link dh_strip dh_compress diff --git a/src/hildon/modest-ui-glade.h b/src/hildon/modest-ui-glade.h index 7c66c73..440e25b 100644 --- a/src/hildon/modest-ui-glade.h +++ b/src/hildon/modest-ui-glade.h @@ -4,6 +4,8 @@ #ifndef __MODEST_UI_GLADE_H__ #define __MODEST_UI_GLADE_H__ +#include + #include "../modest-ui.h" #include "../modest-account-mgr.h" #include "../modest-identity-mgr.h" @@ -30,6 +32,7 @@ struct _ModestUIPrivate { GladeXML *glade_xml; TnyMsgFolderIface *current_folder; + HildonProgram *program; }; #define MODEST_UI_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ diff --git a/src/hildon/modest-ui-main-view.c b/src/hildon/modest-ui-main-view.c index 508e56a..7203be1 100644 --- a/src/hildon/modest-ui-main-view.c +++ b/src/hildon/modest-ui-main-view.c @@ -7,7 +7,8 @@ #include #endif /*HAVE_CONFIG_H*/ -#include +#include +#include /* TODO: put in auto* */ #include @@ -92,23 +93,24 @@ modest_ui_main_view_destroy (GtkWidget *win, GdkEvent *event, gpointer data) gboolean modest_ui_show_main_window (ModestUI *modest_ui) { - GtkWidget *win, *app_view; - gint height, width; + GtkWidget *win; + gint height, width; ModestUIPrivate *priv; - GtkWidget *folder_view, *header_view; - GtkWidget *message_view; - GtkWidget *account_settings_item; - GtkWidget *forward_attached_menu_item; - GtkWidget *delete_item; - GtkWidget *open_item; - GtkWidget *view_attachments_item; - GtkWidget *new_account_item; - GtkWidget *main_menu, *menu_item, *main_toolbar; + GtkWidget *folder_view, *header_view; + GtkWidget *message_view; + GtkWidget *account_settings_item; + GtkWidget *forward_attached_menu_item; + GtkWidget *delete_item; + GtkWidget *open_item; + GtkWidget *view_attachments_item; + GtkWidget *new_account_item; + GtkWidget *main_menu, *menu_item, *main_toolbar; GtkWidget *folder_view_holder, *header_view_holder, *mail_paned; gboolean show_attachments_inline; + HildonProgram *program; priv = MODEST_UI_GET_PRIVATE(modest_ui); @@ -117,7 +119,11 @@ modest_ui_show_main_window (ModestUI *modest_ui) width = modest_conf_get_int (priv->modest_conf, MODEST_CONF_MAIN_WINDOW_WIDTH,NULL); - win = glade_xml_get_widget (priv->glade_xml, "main"); + program = HILDON_PROGRAM (hildon_program_get_instance ()); + priv->program = program; + g_set_application_name (_("Modest")); + + win = glade_xml_get_widget (priv->glade_xml, "appview1"); if (!win) { g_warning ("could not create main window"); return FALSE; @@ -236,12 +242,10 @@ modest_ui_show_main_window (ModestUI *modest_ui) modest_ui); g_signal_connect (win, "delete-event", G_CALLBACK(modest_ui_main_view_destroy), modest_ui); - gtk_widget_set_usize (GTK_WIDGET(win), width, height); - hildon_app_set_title (HILDON_APP(win), PACKAGE_STRING); - - app_view = glade_xml_get_widget (priv->glade_xml, "appview1"); - main_menu = hildon_appview_get_menu(HILDON_APPVIEW(app_view)); + gtk_window_set_title (GTK_WINDOW(win), _("Main")); + + main_menu = gtk_menu_new (); menu_item = glade_xml_get_widget (priv->glade_xml, "MessageMenuItem"); gtk_widget_reparent(menu_item, main_menu); menu_item = glade_xml_get_widget (priv->glade_xml, "EditMenuItem"); @@ -257,18 +261,20 @@ modest_ui_show_main_window (ModestUI *modest_ui) menu_item = glade_xml_get_widget (priv->glade_xml, "CloseMenuItem"); gtk_widget_reparent(menu_item, main_menu); + hildon_window_set_menu (win, main_menu); + main_toolbar = glade_xml_get_widget (priv->glade_xml, "toolbar1"); g_object_ref (main_toolbar); gtk_container_remove (glade_xml_get_widget (priv->glade_xml, "main_top_container"), main_toolbar); - hildon_appview_set_toolbar (HILDON_APPVIEW(app_view), GTK_TOOLBAR(main_toolbar)); - + hildon_window_add_toolbar (HILDON_WINDOW(win), GTK_TOOLBAR(main_toolbar)); gtk_widget_show_all (win); - + menu_item = glade_xml_get_widget (priv->glade_xml, "menubar1"); gtk_widget_hide(menu_item); - + + hildon_program_add_window (program, win); return TRUE; } @@ -631,5 +637,4 @@ on_headers_status_update (GtkWidget *header_view, const gchar *msg, gint status_ gtk_widget_hide (status_box); gtk_statusbar_pop (status_bar, status_id); } -} - +} diff --git a/src/hildon/modest-ui-message-editor.c b/src/hildon/modest-ui-message-editor.c index 9a7feab..b8e40a5 100644 --- a/src/hildon/modest-ui-message-editor.c +++ b/src/hildon/modest-ui-message-editor.c @@ -7,6 +7,9 @@ #include #endif /*HAVE_CONFIG_H*/ +#include +#include + /* TODO: put in auto* */ #include #include @@ -55,7 +58,7 @@ static gboolean close_edit_confirm_dialog(ModestEditorWindow *edit_win) GtkWidget *mdialog; gint res; - mdialog = gtk_message_dialog_new(GTK_WINDOW(edit_win), + mdialog = gtk_message_dialog_new(GTK_WINDOW(edit_win->window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, @@ -81,21 +84,21 @@ close_edit_window (GtkWidget *win, GdkEvent *event, gpointer data) win_data = modest_editor_window_get_data(edit_win); priv = MODEST_UI_GET_PRIVATE(win_data->modest_ui); - // g_message("window was %s modified", modest_editor_window_get_modified(edit_win) ? "" : "not"); - if (modest_editor_window_get_modified(edit_win)) { if (close_edit_confirm_dialog(edit_win)) { - gtk_widget_hide (GTK_WIDGET(edit_win)); - modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(edit_win)); - gtk_widget_destroy(GTK_WIDGET(edit_win)); + gtk_widget_hide (GTK_WIDGET(edit_win->window)); + modest_window_mgr_unregister(priv->modest_window_mgr, HILDON_WINDOW (edit_win->window)); + hildon_program_remove_window (priv->program, HILDON_WINDOW (edit_win->window)); + g_object_unref(edit_win); g_message("closing window"); } else { g_message("not closing window"); } } else { - gtk_widget_hide (GTK_WIDGET(edit_win)); - modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(edit_win)); - gtk_widget_destroy(GTK_WIDGET(edit_win)); + gtk_widget_hide (GTK_WIDGET(edit_win->window)); + modest_window_mgr_unregister(priv->modest_window_mgr, HILDON_WINDOW (edit_win->window)); + hildon_program_remove_window (priv->program, HILDON_WINDOW (edit_win->window)); + g_object_unref(edit_win); g_message("closing window"); } } @@ -108,7 +111,7 @@ GtkContainer GladeXML *glade_xml; EditWinData *win_data; - glade_xml = glade_xml_new(MODEST_GLADE, "new_mail_top_container", NULL); + glade_xml = glade_xml_new(MODEST_GLADE, "new_mail", NULL); if (!glade_xml) return NULL; @@ -119,8 +122,9 @@ GtkContainer *user_data = win_data; - top_container = glade_xml_get_widget(glade_xml, "new_mail_top_container"); + top_container = glade_xml_get_widget(glade_xml, "new_mail"); if (!top_container) { + g_warning ("Could not create window\n"); g_object_unref(G_OBJECT(glade_xml)); return NULL; } @@ -260,17 +264,17 @@ new_editor_with_presets (ModestUI *modest_ui, const gchar *to_header, const gchar *subject_header, const gchar *body, const GList *attachments) { - GtkWidget *edit_win; + ModestEditorWindow *edit_win; GladeXML *glade_xml; GtkWidget *btn, *w; GtkTextBuffer *buf; EditWinData *windata; ModestUIPrivate *priv; - gint height, width; + GtkWidget *toolbar, *menubar, *menu, *menu_item; g_return_if_fail (modest_ui); - edit_win = modest_editor_window_new(modest_ui); + edit_win = MODEST_EDITOR_WINDOW (modest_editor_window_new(modest_ui)); windata = (EditWinData *)modest_editor_window_get_data(MODEST_EDITOR_WINDOW(edit_win)); g_return_if_fail(windata); @@ -290,26 +294,19 @@ new_editor_with_presets (ModestUI *modest_ui, const gchar *to_header, buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(w)); g_signal_connect(buf, "changed", G_CALLBACK(on_editor_buffer_changed), edit_win); - g_signal_connect (edit_win, "destroy-event", G_CALLBACK(close_edit_window), + g_signal_connect (edit_win->window, "destroy-event", G_CALLBACK(close_edit_window), edit_win); - g_signal_connect (edit_win, "delete-event", G_CALLBACK(close_edit_window), + g_signal_connect (edit_win->window, "delete-event", G_CALLBACK(close_edit_window), edit_win); priv = MODEST_UI_GET_PRIVATE(modest_ui); - height = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_EDIT_WINDOW_HEIGHT, NULL); - width = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_EDIT_WINDOW_WIDTH, NULL); - - // g_message("new editor win@%dx%d", width, height); - - gtk_widget_set_usize (GTK_WIDGET(edit_win), width, height); + if (strlen(subject_header) > 0) - gtk_window_set_title (GTK_WINDOW(edit_win), subject_header); + gtk_window_set_title (GTK_WINDOW(edit_win->window), subject_header); else - gtk_window_set_title (GTK_WINDOW(edit_win), _("Untitled")); - - modest_window_mgr_register(priv->modest_window_mgr, G_OBJECT(edit_win), MODEST_EDIT_WINDOW, 0); + gtk_window_set_title (GTK_WINDOW(edit_win->window), _("Untitled")); + + modest_window_mgr_register(priv->modest_window_mgr, G_OBJECT(edit_win->window), MODEST_EDIT_WINDOW, 0); modest_editor_window_set_to_header(MODEST_EDITOR_WINDOW(edit_win), to_header); modest_editor_window_set_cc_header(MODEST_EDITOR_WINDOW(edit_win), cc_header); @@ -320,7 +317,42 @@ new_editor_with_presets (ModestUI *modest_ui, const gchar *to_header, modest_editor_window_set_modified(MODEST_EDITOR_WINDOW(edit_win), FALSE); - gtk_widget_show(edit_win); + menu = gtk_menu_new(); + menu_item = glade_xml_get_widget (priv->glade_xml, "menuitem5"); + gtk_widget_reparent(menu_item, menu); + menu_item = glade_xml_get_widget (priv->glade_xml, "menuitem13"); + gtk_widget_reparent(menu_item, menu); + menu_item = glade_xml_get_widget (priv->glade_xml, "menuitem22"); + gtk_widget_reparent(menu_item, menu); + menu_item = glade_xml_get_widget (priv->glade_xml, "menuitem27"); + gtk_widget_reparent(menu_item, menu); + menu_item = glade_xml_get_widget (priv->glade_xml, "menuitem29"); + gtk_widget_reparent(menu_item, menu); + menu_item = glade_xml_get_widget (priv->glade_xml, "menuitem34"); + gtk_widget_reparent(menu_item, menu); + menu_item = glade_xml_get_widget (priv->glade_xml, "menuitem41"); + gtk_widget_reparent(menu_item, menu); + + hildon_window_set_menu (HILDON_WINDOW (edit_win->window), GTK_MENU(menu)); + + toolbar = glade_xml_get_widget (priv->glade_xml, "toolbar2"); + gtk_widget_hide (toolbar); + g_object_ref (toolbar); + gtk_container_remove (GTK_CONTAINER (glade_xml_get_widget (priv->glade_xml, + "new_mail_top_container")), toolbar); + hildon_window_add_toolbar (HILDON_WINDOW (edit_win->window), GTK_TOOLBAR (toolbar)); + gtk_widget_show_all (GTK_WIDGET (edit_win->window)); + + while (gtk_events_pending ()) + gtk_main_iteration (); + + toolbar = glade_xml_get_widget (priv->glade_xml, "toolbar2"); + gtk_widget_hide (toolbar); + + menubar = glade_xml_get_widget (priv->glade_xml, "menubar2"); + gtk_widget_hide (GTK_WIDGET(menubar)); + + hildon_program_add_window (priv->program, HILDON_WINDOW (edit_win->window)); } @@ -445,7 +477,7 @@ on_attach_button_clicked (GtkWidget *widget, ModestEditorWindow *modest_editwin) gchar *filename = NULL; dialog = gtk_file_chooser_dialog_new ("Open File", - GTK_WINDOW(modest_editwin), + GTK_WINDOW(modest_editwin->window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, @@ -544,10 +576,10 @@ on_send_button_clicked (GtkWidget *widget, ModestEditorWindow *modest_editwin) g_free (body); g_object_unref (G_OBJECT(actions)); - gtk_widget_hide (GTK_WIDGET(modest_editwin)); + gtk_widget_hide (GTK_WIDGET(modest_editwin->window)); modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(modest_editwin)); - if (GTK_IS_WIDGET(modest_editwin)) { - gtk_widget_destroy(GTK_WIDGET(modest_editwin)); + if (G_IS_OBJECT(modest_editwin)) { + g_object_unref(modest_editwin); } else g_warning("editor window has vanished!"); } diff --git a/src/hildon/modest-ui.c b/src/hildon/modest-ui.c index c11e892..1f183df 100644 --- a/src/hildon/modest-ui.c +++ b/src/hildon/modest-ui.c @@ -109,6 +109,7 @@ modest_ui_init (ModestUI *obj) priv->header_view = NULL; priv->message_view = NULL; priv->current_folder = NULL; + priv->program = NULL; } @@ -315,5 +316,3 @@ on_account_selector_selection_changed (GtkWidget *widget, gpointer user_data) free(account_name); } - - diff --git a/src/hildon/modest.glade b/src/hildon/modest.glade index 8c1f876..1cc7dba 100644 --- a/src/hildon/modest.glade +++ b/src/hildon/modest.glade @@ -8,8 +8,7 @@ Modest 3" 512 - - ]]> + @@ -775,7 +774,7 @@ True - True + False 0 @@ -806,23 +805,8 @@ - - Modest - New message - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 800 - 600 - True - False - qgn_toolb_messagin.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False + + Untitled @@ -832,7 +816,7 @@ - True + False @@ -1356,74 +1340,6 @@ - - True - GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_ICONS - True - True - - - - True - Send message - Send - True - qgn_toolb_messagin_send.png - True - True - False - - - False - True - - - - - - True - Add attachment - Attach - True - qgn_list_gene_attacpap.png - True - True - False - - - False - True - - - - - - True - Add reipients - Recipients - True - qgn_list_gene_contacts.png - True - True - False - - - False - True - - - - - - - 0 - False - False - - - - True True @@ -1584,8 +1500,76 @@ True + + + True + GTK_ORIENTATION_HORIZONTAL + GTK_TOOLBAR_ICONS + True + True + + + + True + Send message + Send + True + qgn_toolb_messagin_send.png + True + True + False + + + False + True + + + + + + True + Add attachment + Attach + True + qgn_list_gene_attacpap.png + True + True + False + + + False + True + + + + + + True + Add reipients + Recipients + True + qgn_list_gene_contacts.png + True + True + False + + + False + True + + + + + + + 0 + False + False + + + - + diff --git a/src/modest-editor-window.c b/src/modest-editor-window.c index 7c36918..8ab01f2 100644 --- a/src/modest-editor-window.c +++ b/src/modest-editor-window.c @@ -19,6 +19,7 @@ enum { typedef struct _ModestEditorWindowPrivate ModestEditorWindowPrivate; struct _ModestEditorWindowPrivate { + GtkWidget *window; gpointer user_data; gboolean modified; GList *attachments; @@ -29,7 +30,7 @@ struct _ModestEditorWindowPrivate { MODEST_TYPE_EDITOR_WINDOW, \ ModestEditorWindowPrivate)) /* globals */ -static GtkWindowClass *parent_class = NULL; +static GObjectClass *parent_class = NULL; /* uncomment the following if you have defined any signals */ /* static guint signals[LAST_SIGNAL] = {0}; */ @@ -50,7 +51,7 @@ modest_editor_window_get_type (void) 1, /* n_preallocs */ (GInstanceInitFunc) modest_editor_window_init, }; - my_type = g_type_register_static (GTK_TYPE_WINDOW, + my_type = g_type_register_static (G_TYPE_OBJECT, "ModestEditorWindow", &my_info, 0); } @@ -68,12 +69,6 @@ modest_editor_window_class_init (ModestEditorWindowClass *klass) g_type_class_add_private (gobject_class, sizeof(ModestEditorWindowPrivate)); - /* signal definitions go here, e.g.: */ -/* signals[MY_SIGNAL_1] = */ -/* g_signal_new ("my_signal_1",....); */ -/* signals[MY_SIGNAL_2] = */ -/* g_signal_new ("my_signal_2",....); */ -/* etc. */ } static void @@ -86,6 +81,7 @@ modest_editor_window_init (ModestEditorWindow *obj) priv->attachments = NULL; priv->identity = NULL; priv->transport = NULL; + obj->window = NULL; } static void @@ -101,16 +97,18 @@ modest_editor_window_finalize (GObject *obj) modest_editor_window_set_attachments(MODEST_EDITOR_WINDOW(obj), NULL); g_free(priv->identity); g_free(priv->transport); + g_object_unref (MODEST_EDITOR_WINDOW(obj)->window); + MODEST_EDITOR_WINDOW(obj)->window = NULL; G_OBJECT_CLASS(parent_class)->finalize (obj); } -GtkWidget* +GObject* modest_editor_window_new (ModestUI *ui) { GObject *self; ModestEditorWindowPrivate *priv; - GtkWidget *w; + GObject *edit_win; gpointer data; self = G_OBJECT(g_object_new(MODEST_TYPE_EDITOR_WINDOW, NULL)); @@ -119,18 +117,17 @@ modest_editor_window_new (ModestUI *ui) /* for now create a local test-window */ data = NULL; - w = GTK_WIDGET(modest_ui_new_editor_window(ui, &data)); - // g_message("new data = %p", data); - if (!w) + edit_win = modest_ui_new_editor_window(ui, &data); + + if (!edit_win) return NULL; if (!data) g_message("editor window user data is emtpy"); - gtk_container_add(GTK_CONTAINER(self), w); + MODEST_EDITOR_WINDOW(self)->window = edit_win; priv->user_data = data; - // g_message("new priv->data = %p", priv->user_data); - return GTK_WIDGET(self); + return self; } /* @@ -334,4 +331,4 @@ modest_editor_window_get_transport(ModestEditorWindow *edit_win) priv = MODEST_EDITOR_WINDOW_GET_PRIVATE(edit_win); return priv->transport; -} +} diff --git a/src/modest-editor-window.h b/src/modest-editor-window.h index d5c273a..84adb93 100644 --- a/src/modest-editor-window.h +++ b/src/modest-editor-window.h @@ -24,7 +24,8 @@ typedef struct _ModestEditorWindow ModestEditorWindow; typedef struct _ModestEditorWindowClass ModestEditorWindowClass; struct _ModestEditorWindow { - GtkWindow parent; + GObject parent; + GtkWindow *window; /* insert public members, if any */ }; @@ -47,7 +48,7 @@ GType modest_editor_window_get_type (void) G_GNUC_CONST; * * Returns: a GtkWindow* to show and populate */ -GtkWidget *modest_editor_window_new (ModestUI *ui); +GObject *modest_editor_window_new (ModestUI *ui); /** * modest_editor_window_get_data: -- 1.7.9.5