which will be dealt with shortly.
pmo-trunk-r361
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);
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;
}
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));
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);
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,
ACCOUNT_PROT, protocol,
- -1);
+ -1);
g_free(hostname);
g_free(protocol);
}
/* TODO: put in auto* */
#include <tny-text-buffer-stream.h>
+#include <tny-list.h>
#include <tny-msg-folder.h>
#include "../modest-ui.h"
static void on_delete_clicked (GtkWidget *widget, gpointer user_data);
-static void on_view_attachments_toggled(GtkWidget *widget, gpointer user_data);
-
static void on_sendreceive_button_clicked (GtkWidget *widget, gpointer user_data);
static void on_forward_attached_activated (GtkWidget *widget, gpointer user_data);
else
gtk_widget_hide(win);
}
-
-
gboolean
modest_ui_show_main_window (ModestUI *modest_ui)
{
GtkWidget *folder_view, *header_view;
GtkWidget *message_view;
GtkWidget *account_settings_item;
- GtkWidget *forward_attached_menu_item;
GtkWidget *delete_item;
GtkWidget *open_item;
+ GtkWidget *forward_attached_menu_item;
GtkWidget *view_attachments_item;
GtkWidget *new_account_item;
GtkWidget *folder_view_holder,
*header_view_holder,
*mail_paned;
- gboolean show_attachments_inline;
priv = MODEST_UI_GET_PRIVATE(modest_ui);
}
folder_view = GTK_WIDGET(modest_main_window_folder_tree(priv->modest_acc_mgr,
- priv->account_store));
+ priv->account_store));
priv->folder_view = folder_view;
folder_view_holder = glade_xml_get_widget (priv->glade_xml, "folders");
if (!folder_view||!folder_view_holder) {
return FALSE;
}
gtk_container_add (GTK_CONTAINER(folder_view_holder), folder_view);
-
+
header_view = GTK_WIDGET(modest_main_window_header_tree (NULL));
priv->header_view = header_view;
header_view_holder = glade_xml_get_widget (priv->glade_xml, "mail_list");
g_signal_connect (G_OBJECT(folder_view), "folder_selected",
G_CALLBACK(on_folder_clicked), modest_ui);
-
- show_attachments_inline = modest_conf_get_bool(priv->modest_conf,
- 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);
g_signal_connect (forward_attached_menu_item, "activate", G_CALLBACK(on_forward_attached_activated),
modest_ui);
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(view_attachments_item),
- modest_conf_get_bool(priv->modest_conf,
- MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE,
- NULL));
-
- g_signal_connect (view_attachments_item, "toggled",
- G_CALLBACK(on_view_attachments_toggled), modest_ui);
-
register_toolbar_callbacks (modest_ui);
modest_window_mgr_register (priv->modest_window_mgr,
static void
-on_view_attachments_toggled(GtkWidget *widget, gpointer user_data)
-{
- ModestUI *modest_ui = (ModestUI *)user_data;
- GtkWidget *view_attachments_item;
- ModestTnyMsgView *msg_view;
- ModestUIPrivate *priv;
- gboolean view_attachments_inline;
-
- priv = MODEST_UI_GET_PRIVATE(modest_ui);
- view_attachments_item = glade_xml_get_widget (priv->glade_xml, "menu_view_attachments");
- g_return_if_fail(view_attachments_item);
-
- msg_view = MODEST_TNY_MSG_VIEW(priv->message_view);
-
- view_attachments_inline = gtk_check_menu_item_get_active(
- GTK_CHECK_MENU_ITEM(view_attachments_item));
-
- modest_conf_set_bool(priv->modest_conf,
- 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);
-}
-
-
-static void
on_delete_clicked (GtkWidget *widget, gpointer user_data)
{
ModestUI *modest_ui = (ModestUI *)user_data;
static void
on_sendreceive_button_clicked (GtkWidget *widget, gpointer user_data)
{
- ModestUI *modest_ui = (ModestUI *)user_data;
+ ModestUI *modest_ui;
ModestUIPrivate *priv;
- TnyAccountStoreIface *account_store;
- const GList *store_accounts;
- const GList *iter;
- g_return_if_fail (modest_ui);
+ TnyListIface *store_accounts;
+ TnyIteratorIface *iter;
+
+ g_return_if_fail (user_data);
+
+ modest_ui = MODEST_UI(user_data);
priv = MODEST_UI_GET_PRIVATE(modest_ui);
- account_store = priv->account_store;
- store_accounts =
- tny_account_store_iface_get_store_accounts (account_store);
+ store_accounts = tny_list_new ();
+ tny_account_store_iface_get_accounts (priv->account_store, store_accounts,
+ TNY_ACCOUNT_STORE_IFACE_STORE_ACCOUNTS);
+ iter = tny_list_iface_create_iterator (store_accounts);
+
+ if (tny_iterator_iface_has_first (iter)) {
+ while (1) {
+ TnyStoreAccountIface *account;
+ account = TNY_STORE_ACCOUNT_IFACE(tny_iterator_iface_current(iter));
+ modest_tny_store_actions_update_folders (account);
+
+ if (!tny_iterator_iface_has_next (iter))
+ break;
+
+ tny_iterator_iface_next (iter);
+ }
- for (iter = store_accounts; iter; iter = iter->next) {
- modest_tny_store_actions_update_folders (TNY_STORE_ACCOUNT_IFACE (iter->data));
-
}
-
+ g_object_unref (G_OBJECT(iter));
+ g_object_unref (G_OBJECT(store_accounts));
+
if (priv->header_view && priv->current_folder) {
-
+
modest_tny_header_tree_view_set_folder (MODEST_TNY_HEADER_TREE_VIEW(priv->header_view),
priv->current_folder);
gtk_widget_queue_draw (priv->header_view);
}
}
+
+
static void
on_forward_attached_activated (GtkWidget *widget, gpointer user_data)
{
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <glib/gi18n.h>
/* TODO: put in auto* */
#include <tny-text-buffer-stream.h>
#include <tny-msg-folder.h>
+#include <tny-list.h>
+
#include "../modest-ui.h"
#include "../modest-window-mgr.h"
g_return_if_fail (modest_ui);
- edit_win = modest_editor_window_new(modest_ui);
+ edit_win = GTK_WIDGET(modest_editor_window_new(modest_ui));
windata = (EditWinData *)modest_editor_window_get_data(MODEST_EDITOR_WINDOW(edit_win));
g_return_if_fail(windata);
gchar *body;
GtkTextIter start, end;
GtkTextBuffer *buf;
- TnyAccountStoreIface *account_store;
- const GList *transport_accounts;
TnyTransportAccountIface *transport_account;
ModestIdentityMgr *id_mgr;
EditWinData *win_data;
GList * attachments;
-
+ TnyListIface *transport_accounts;
+ TnyIteratorIface *iter;
+
win_data = modest_editor_window_get_data(modest_editwin);
modest_ui = win_data->modest_ui;
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) {
- g_message ("cannot send message: no transport account defined");
- return;
- } else /* take the first one! */
- transport_account =
- TNY_TRANSPORT_ACCOUNT_IFACE(transport_accounts->data);
to_entry = glade_xml_get_widget (win_data->glade_xml, "to_entry");
subject_entry = glade_xml_get_widget (win_data->glade_xml, "subject_entry");
g_message("sending \"%s\" %s ==> %s", subject, email_from, to);
+ transport_accounts = TNY_LIST_IFACE(tny_list_new ());
+ tny_account_store_iface_get_accounts (priv->account_store,
+ transport_accounts,
+ TNY_ACCOUNT_STORE_IFACE_TRANSPORT_ACCOUNTS);
+
+ iter = tny_list_iface_create_iterator (transport_accounts);
+
+ if (!transport_accounts || !tny_iterator_iface_has_first(iter)) {
+ g_printerr ("modest: cannot send message: no transport account defined");
+ return;
+ } else { /* take the first one! */
+ tny_iterator_iface_first (iter);
+ transport_account =
+ TNY_TRANSPORT_ACCOUNT_IFACE(tny_iterator_iface_current(iter));
+ }
+
modest_tny_transport_actions_send_message (actions,
transport_account,
email_from,
to, "", "", subject,
body,
attachments);
-
+ g_object_unref (G_OBJECT(iter));
+ g_object_unref (G_OBJECT(transport_accounts));
+
modest_editor_window_set_attachments(modest_editwin, NULL); /* This unrefs them, too. */
g_free (body);
g_object_unref (G_OBJECT(actions));
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
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-/* modest-ui.c */
-
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <glib/gi18n.h>
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_IFACE(account_store));
}
ModestAccountMgr *modest_acc_mgr;
ModestIdentityMgr *modest_id_mgr;
TnyAccountStoreIface *account_store_iface;
- GSList *account_names_list;
+ GSList *account_names_list, *cursor;
GSList *identities_list;
g_return_val_if_fail (modest_conf, NULL);
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));
+
+ cursor = account_names_list;
+ while (cursor) {
+ g_free (cursor->data);
+ cursor = cursor->next;
+ }
g_slist_free(account_names_list);
+
+
+ cursor = identities_list;
+ while (cursor) {
+ g_free (cursor->data);
+ cursor = cursor->next;
+ }
g_slist_free(identities_list);
return obj;