From 0cc6cd8e2173a6f8aa2cf486a6ef2b2e2d2a127f Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 11 Jul 2006 16:53:18 +0000 Subject: [PATCH] * update for the changes in the APIs, as well as for *some* compile warnings pmo-trunk-r366 --- src/hildon/modest-ui-account-setup.c | 112 +++++++++++++++++---------------- src/hildon/modest-ui-main-view.c | 38 +++++------ src/hildon/modest-ui-message-editor.c | 25 +++++--- src/hildon/modest-ui-wizard.c | 6 +- src/hildon/modest-ui.c | 15 +++-- 5 files changed, 104 insertions(+), 92 deletions(-) diff --git a/src/hildon/modest-ui-account-setup.c b/src/hildon/modest-ui-account-setup.c index 57282ec..549b6b2 100644 --- a/src/hildon/modest-ui-account-setup.c +++ b/src/hildon/modest-ui-account-setup.c @@ -27,9 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -/* modest-ui-wizard.c */ - +#include #include #include #include @@ -189,11 +187,10 @@ account_delete_action(GtkWidget *button, gtk_widget_show_all(confirmation_dialog); result=gtk_dialog_run(GTK_DIALOG(confirmation_dialog)); - if (result==GTK_RESPONSE_OK) - { - modest_account_mgr_remove_server_account(priv->modest_acc_mgr, - account_name, - NULL); + if (result==GTK_RESPONSE_OK) { + modest_account_mgr_remove_account(priv->modest_acc_mgr, + account_name, TRUE, + NULL); } gtk_widget_destroy(confirmation_dialog); @@ -640,24 +637,31 @@ write_account(GladeXML *glade_xml, ModestUI *modest_ui, gboolean newaccount) { g_free(protocol); return retval; } - if (!modest_account_mgr_set_server_account_string(priv->modest_acc_mgr, - account, - MODEST_ACCOUNT_HOSTNAME, - gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "ASHostnameEntry"))), - NULL)) + if (!modest_account_mgr_set_string(priv->modest_acc_mgr, + account, + MODEST_ACCOUNT_HOSTNAME, + gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "ASHostnameEntry"))), + TRUE, + NULL)) + return FALSE; - if (!modest_account_mgr_set_server_account_string(priv->modest_acc_mgr, - account, - MODEST_ACCOUNT_USERNAME, - gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "ASUsernameEntry"))), - NULL)) + + if (!modest_account_mgr_set_string(priv->modest_acc_mgr, + account, + MODEST_ACCOUNT_USERNAME, + gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "ASUsernameEntry"))), + TRUE, + NULL)) return FALSE; - if (!modest_account_mgr_set_server_account_string(priv->modest_acc_mgr, - account, - MODEST_ACCOUNT_PASSWORD, - gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "ASPasswordEntry"))), - NULL)) + + if (!modest_account_mgr_set_string(priv->modest_acc_mgr, + account, + MODEST_ACCOUNT_PASSWORD, + gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "ASPasswordEntry"))), + TRUE, + NULL)) return FALSE; + return TRUE; } @@ -708,7 +712,7 @@ identity_setup_dialog (ModestUI *modest_ui, GtkTreeModel *accounts_model, gchar ACCOUNT_NAME, outacc_name)) gtk_combo_box_set_active_iter(GTK_COMBO_BOX(outgoing_server), &out_iter); - + awidget=glade_xml_get_widget(glade_xml, "ISIdentityEntry"); gtk_widget_set_sensitive(awidget, FALSE); gtk_entry_set_text(GTK_ENTRY(awidget), identity); @@ -812,10 +816,10 @@ account_setup_dialog (ModestUI *modest_ui, gchar *account) { gtk_widget_set_sensitive(awidget, FALSE); gtk_entry_set_text(GTK_ENTRY(awidget), account); - tmptext = modest_account_mgr_get_server_account_string(acc_mgr, - account, - MODEST_ACCOUNT_PROTO, - NULL); + tmptext = modest_account_mgr_get_string(acc_mgr, + account, + MODEST_ACCOUNT_PROTO, + TRUE, NULL); awidget=glade_xml_get_widget(glade_xml, "ASProtocolComboBox"); gtk_widget_set_sensitive(awidget, FALSE); typemodel = gtk_combo_box_get_model(GTK_COMBO_BOX(awidget)); @@ -824,26 +828,26 @@ account_setup_dialog (ModestUI *modest_ui, gchar *account) { g_free(tmptext); - tmptext = modest_account_mgr_get_server_account_string(acc_mgr, - account, - MODEST_ACCOUNT_HOSTNAME, - NULL); + tmptext = modest_account_mgr_get_string(acc_mgr, + account, + MODEST_ACCOUNT_HOSTNAME, + TRUE, NULL); awidget=glade_xml_get_widget(glade_xml, "ASHostnameEntry"); gtk_entry_set_text(GTK_ENTRY(awidget), tmptext); g_free(tmptext); - tmptext = modest_account_mgr_get_server_account_string(acc_mgr, - account, - MODEST_ACCOUNT_USERNAME, - NULL); + tmptext = modest_account_mgr_get_string(acc_mgr, + account, + MODEST_ACCOUNT_USERNAME, + TRUE, NULL); awidget=glade_xml_get_widget(glade_xml, "ASUsernameEntry"); gtk_entry_set_text(GTK_ENTRY(awidget), tmptext); g_free(tmptext); - tmptext = modest_account_mgr_get_server_account_string(acc_mgr, - account, - MODEST_ACCOUNT_PASSWORD, - NULL); + tmptext = modest_account_mgr_get_string(acc_mgr, + account, + MODEST_ACCOUNT_PASSWORD, + TRUE, NULL); awidget=glade_xml_get_widget(glade_xml, "ASPasswordEntry"); gtk_entry_set_text(GTK_ENTRY(awidget), tmptext); g_free(tmptext); @@ -940,25 +944,27 @@ create_accounts_model(ModestAccountMgr *acc_mgr) { gchar *hostname; gchar *protocol; - acc_names_list = modest_account_mgr_server_account_names(acc_mgr, - NULL, - MODEST_PROTO_TYPE_ANY, - NULL, - FALSE); + acc_names_list = modest_account_mgr_search_server_accounts (acc_mgr, + NULL, + MODEST_PROTO_TYPE_ANY, + NULL, + FALSE); acc_list_store = gtk_list_store_new(ACCOUNT_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); for (acc_names_list_iter=acc_names_list; acc_names_list_iter!=NULL; acc_names_list_iter=g_slist_next(acc_names_list_iter)) { gtk_list_store_append(acc_list_store, &acc_list_store_iter); - hostname=modest_account_mgr_get_server_account_string(acc_mgr, - acc_names_list_iter->data, - MODEST_ACCOUNT_HOSTNAME, - NULL); - protocol=modest_account_mgr_get_server_account_string(acc_mgr, - acc_names_list_iter->data, - MODEST_ACCOUNT_PROTO, - NULL); + hostname=modest_account_mgr_get_string(acc_mgr, + acc_names_list_iter->data, + MODEST_ACCOUNT_HOSTNAME, + TRUE, + NULL); + protocol=modest_account_mgr_get_string(acc_mgr, + acc_names_list_iter->data, + MODEST_ACCOUNT_PROTO, + TRUE, + NULL); gtk_list_store_set(acc_list_store, &acc_list_store_iter, ACCOUNT_NAME, acc_names_list_iter->data, ACCOUNT_HOST, hostname, diff --git a/src/hildon/modest-ui-main-view.c b/src/hildon/modest-ui-main-view.c index aaea6c0..4df1de8 100644 --- a/src/hildon/modest-ui-main-view.c +++ b/src/hildon/modest-ui-main-view.c @@ -185,14 +185,14 @@ modest_ui_show_main_window (ModestUI *modest_ui) MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE, NULL); - message_view = GTK_WIDGET(modest_tny_msg_view_new (NULL, show_attachments_inline)); + message_view = GTK_WIDGET(modest_tny_msg_view_new (NULL)); priv->message_view = message_view; if (!message_view) { g_warning ("failed to create message view"); return FALSE; } - g_signal_connect(G_OBJECT(message_view), "on_mailto_clicked", - G_CALLBACK(ui_on_mailto_clicked), modest_ui); + //g_signal_connect(G_OBJECT(message_view), "on_mailto_clicked", + // G_CALLBACK(ui_on_mailto_clicked), modest_ui); mail_paned = glade_xml_get_widget (priv->glade_xml, "mail_paned"); gtk_paned_add2 (GTK_PANED(mail_paned), message_view); @@ -291,12 +291,12 @@ 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); + hildon_window_set_menu (HILDON_WINDOW(win), GTK_MENU(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); + gtk_container_remove (GTK_CONTAINER(glade_xml_get_widget (priv->glade_xml, + "main_top_container")), main_toolbar); hildon_window_add_toolbar (HILDON_WINDOW(win), GTK_TOOLBAR(main_toolbar)); gtk_widget_show_all (win); @@ -304,7 +304,8 @@ modest_ui_show_main_window (ModestUI *modest_ui) menu_item = glade_xml_get_widget (priv->glade_xml, "menubar1"); gtk_widget_hide(menu_item); - hildon_program_add_window (program, win); + hildon_program_add_window (HILDON_PROGRAM(program), + HILDON_WINDOW(win)); return TRUE; } @@ -535,8 +536,6 @@ on_view_attachments_toggled(GtkWidget *widget, gpointer user_data) MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE, view_attachments_inline, NULL); - - modest_tny_msg_view_set_show_attachments_inline_flag(msg_view, view_attachments_inline); } @@ -601,20 +600,23 @@ on_sendreceive_button_clicked (GtkWidget *widget, gpointer user_data) ModestUI *modest_ui = (ModestUI *)user_data; ModestUIPrivate *priv; TnyAccountStoreIface *account_store; - const GList *store_accounts; - const GList *iter; + TnyListIface *store_accounts = NULL; + TnyIteratorIface *iter; g_return_if_fail (modest_ui); priv = MODEST_UI_GET_PRIVATE(modest_ui); - + account_store = priv->account_store; - store_accounts = - tny_account_store_iface_get_store_accounts (account_store); - - for (iter = store_accounts; iter; iter = iter->next) { - modest_tny_store_actions_update_folders (TNY_STORE_ACCOUNT_IFACE (iter->data)); - + tny_account_store_iface_get_accounts (account_store, store_accounts, + TNY_ACCOUNT_STORE_IFACE_STORE_ACCOUNTS); + iter = tny_list_iface_create_iterator (store_accounts); + + while (!tny_iterator_iface_is_done(iter)) { + modest_tny_store_actions_update_folders + (TNY_STORE_ACCOUNT_IFACE (tny_iterator_iface_current(iter))); + tny_iterator_iface_next (iter); } + g_object_unref (iter); if (priv->header_view && priv->current_folder) { diff --git a/src/hildon/modest-ui-message-editor.c b/src/hildon/modest-ui-message-editor.c index 2dda099..d0d6170 100644 --- a/src/hildon/modest-ui-message-editor.c +++ b/src/hildon/modest-ui-message-editor.c @@ -117,7 +117,7 @@ close_edit_window (GtkWidget *win, GdkEvent *event, gpointer data) if (modest_editor_window_get_modified(edit_win)) { if (close_edit_confirm_dialog(edit_win)) { gtk_widget_hide (GTK_WIDGET(edit_win->window)); - modest_window_mgr_unregister(priv->modest_window_mgr, HILDON_WINDOW (edit_win->window)); + modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(edit_win->window)); hildon_program_remove_window (priv->program, HILDON_WINDOW (edit_win->window)); g_object_unref(edit_win); g_message("closing window"); @@ -126,7 +126,7 @@ close_edit_window (GtkWidget *win, GdkEvent *event, gpointer data) } } else { gtk_widget_hide (GTK_WIDGET(edit_win->window)); - modest_window_mgr_unregister(priv->modest_window_mgr, HILDON_WINDOW (edit_win->window)); + modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT (edit_win->window)); hildon_program_remove_window (priv->program, HILDON_WINDOW (edit_win->window)); g_object_unref(edit_win); g_message("closing window"); @@ -547,7 +547,8 @@ on_send_button_clicked (GtkWidget *widget, ModestEditorWindow *modest_editwin) GtkTextIter start, end; GtkTextBuffer *buf; TnyAccountStoreIface *account_store; - const GList *transport_accounts; + TnyListIface *transport_accounts; + TnyIteratorIface *iter; TnyTransportAccountIface *transport_account; ModestIdentityMgr *id_mgr; EditWinData *win_data; @@ -565,15 +566,23 @@ on_send_button_clicked (GtkWidget *widget, ModestEditorWindow *modest_editwin) priv = MODEST_UI_GET_PRIVATE(modest_ui); account_store = priv->account_store; - transport_accounts = - tny_account_store_iface_get_transport_accounts (account_store); - if (!transport_accounts) { + + transport_accounts = tny_list_new (); + tny_account_store_iface_get_accounts (priv->account_store, + transport_accounts, + TNY_ACCOUNT_STORE_IFACE_TRANSPORT_ACCOUNTS); + tny_list_iface_create_iterator (transport_accounts); + + iter = tny_list_iface_create_iterator(transport_accounts); + if (!tny_iterator_iface_first(iter)) { g_message ("cannot send message: no transport account defined"); return; } else /* take the first one! */ transport_account = - TNY_TRANSPORT_ACCOUNT_IFACE(transport_accounts->data); - + TNY_TRANSPORT_ACCOUNT_IFACE(tny_iterator_iface_current(iter)); + g_object_unref (iter); + g_object_unref (transport_accounts); + to_entry = glade_xml_get_widget (win_data->glade_xml, "to_entry"); subject_entry = glade_xml_get_widget (win_data->glade_xml, "subject_entry"); body_view = glade_xml_get_widget (win_data->glade_xml, "body_view"); diff --git a/src/hildon/modest-ui-wizard.c b/src/hildon/modest-ui-wizard.c index fb0f70e..2266497 100644 --- a/src/hildon/modest-ui-wizard.c +++ b/src/hildon/modest-ui-wizard.c @@ -26,10 +26,6 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - - -/* modest-ui-wizard.c */ - #include #include #include @@ -162,7 +158,7 @@ gchar *search_unused_account_or_identity_name(gpointer mgr, gchar *draft) { tmpaccount_name=g_string_new(""); g_string_printf(tmpaccount_name, "%s", draft); if(MODEST_IS_ACCOUNT_MGR(mgr)) { - for(counter=0; modest_account_mgr_server_account_exists(mgr, tmpaccount_name->str, NULL); counter++) + for(counter=0; modest_account_mgr_account_exists(mgr, tmpaccount_name->str, TRUE, NULL); counter++) g_string_printf(tmpaccount_name, "%s%d", draft, counter); } else diff --git a/src/hildon/modest-ui.c b/src/hildon/modest-ui.c index 78b91db..9999a1d 100644 --- a/src/hildon/modest-ui.c +++ b/src/hildon/modest-ui.c @@ -27,9 +27,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -/* modest-ui.c */ - #include #include #include @@ -69,7 +66,7 @@ static void modest_ui_class_init (ModestUIClass *klass); static void modest_ui_init (ModestUI *obj); static void modest_ui_finalize (GObject *obj); -static void modest_ui_window_destroy (GtkWidget *win, GdkEvent *event, gpointer data); +//static void modest_ui_window_destroy (GtkWidget *win, GdkEvent *event, gpointer data); static void modest_ui_last_window_closed (GObject *obj, gpointer data); gchar *on_password_requested (TnyAccountIface *, const gchar *, gboolean *); @@ -172,9 +169,11 @@ on_accounts_reloaded (ModestTnyAccountStore *account_store, gpointer user_data) g_return_if_fail (MODEST_IS_TNY_FOLDER_TREE_VIEW (priv->folder_view)); g_return_if_fail (MODEST_IS_TNY_HEADER_TREE_VIEW (priv->header_view)); - modest_tny_header_tree_view_set_folder (priv->header_view, NULL); + modest_tny_header_tree_view_set_folder (MODEST_TNY_HEADER_TREE_VIEW(priv->header_view), + NULL); - modest_tny_folder_tree_view_update_model(priv->folder_view, account_store); + modest_tny_folder_tree_view_update_model(MODEST_TNY_FOLDER_TREE_VIEW(priv->folder_view), + TNY_ACCOUNT_STORE(account_store)); } @@ -244,8 +243,8 @@ modest_ui_new (ModestConf *modest_conf) G_CALLBACK(modest_ui_last_window_closed), NULL); - account_names_list = modest_account_mgr_server_account_names(modest_acc_mgr, - NULL, MODEST_PROTO_TYPE_ANY, NULL, FALSE); + account_names_list = modest_account_mgr_search_server_accounts (modest_acc_mgr, + NULL, MODEST_PROTO_TYPE_ANY, NULL, FALSE); identities_list = modest_identity_mgr_identity_names(modest_id_mgr, NULL); if (!(account_names_list != NULL || identities_list != NULL)) wizard_account_dialog(MODEST_UI(obj)); -- 1.7.9.5