static void restore_sizes (ModestMainWindow *self);
static void save_sizes (ModestMainWindow *self);
+static void get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data);
/* list my signals */
enum {
ModestWidgetFactory *widget_factory;
TnyPlatformFactory *factory;
-
+
ModestHeaderView *header_view;
ModestFolderView *folder_view;
ModestMsgView *msg_preview;
#define MODEST_MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_MAIN_WINDOW, \
ModestMainWindowPrivate))
+
+typedef struct _GetMsgAsyncHelper {
+ ModestMainWindowPrivate *main_window_private;
+ guint action;
+ ModestMailOperationReplyType reply_type;
+ ModestMailOperationForwardType forward_type;
+ gchar *from;
+} GetMsgAsyncHelper;
+
/* globals */
static GtkWindowClass *parent_class = NULL;
gtk_about_dialog_set_comments ( GTK_ABOUT_DIALOG(about),
_("a modest e-mail client\n\n"
"design and implementation: Dirk-Jan C. Binnema\n"
- "contributions from the fine people at KernelConcepts\n\n"
+ "contributions from the fine people at KernelConcepts and Igalia\n"
"uses the tinymail email framework written by Philip van Hoof"));
gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(about), authors);
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(about), "http://modest.garage.maemo.org");
}
static void
-on_menu_reply_forward (ModestMainWindow *self, guint action, GtkWidget *widget)
+get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
{
GtkWidget *msg_win;
+ TnyHeader *new_header;
+ TnyMsg *new_msg;
+ ModestMainWindowPrivate *priv;
+ ModestEditType edit_type = -2;
+ GetMsgAsyncHelper *helper;
+
+ helper = (GetMsgAsyncHelper *) (user_data);
+ priv = helper->main_window_private;
+
+ /* FIXME: select proper action */
+ new_msg = NULL;
+ switch (helper->action) {
+ case 1:
+ new_msg =
+ modest_mail_operation_create_reply_mail (msg, helper->from, helper->reply_type,
+ MODEST_MAIL_OPERATION_REPLY_MODE_SENDER);
+ edit_type = MODEST_EDIT_TYPE_REPLY;
+ break;
+ case 2:
+ new_msg =
+ modest_mail_operation_create_reply_mail (msg, helper->from, helper->reply_type,
+ MODEST_MAIL_OPERATION_REPLY_MODE_ALL);
+ edit_type = MODEST_EDIT_TYPE_REPLY;
+ break;
+ case 3:
+ new_msg =
+ modest_mail_operation_create_forward_mail (msg, helper->from, helper->forward_type);
+ edit_type = MODEST_EDIT_TYPE_FORWARD;
+ break;
+ default:
+ g_warning ("unexpected action type: %d", helper->action);
+ }
+
+ if (new_msg) {
+ /* Set from */
+ new_header = tny_msg_get_header (new_msg);
+ tny_header_set_from (new_header, helper->from);
+
+ /* Show edit window */
+ msg_win = modest_edit_msg_window_new (priv->widget_factory,
+ edit_type,
+ new_msg);
+ gtk_widget_show (msg_win);
+
+ /* Clean and go on */
+ g_object_unref (new_msg);
+ }
+}
+
+static void
+on_menu_reply_forward (ModestMainWindow *self, guint action, GtkWidget *widget)
+{
ModestMainWindowPrivate *priv;
ModestHeaderView *header_view;
TnyList *header_list;
TnyIterator *iter;
- const gchar *from;
gchar *reply_key, *forward_key;
ModestMailOperationReplyType reply_type;
ModestMailOperationForwardType forward_type;
ModestConf *conf;
GError *error;
+ GetMsgAsyncHelper *helper;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
error = NULL;
reply_key = g_strdup_printf ("%s/%s", MODEST_CONF_NAMESPACE, MODEST_CONF_REPLY_TYPE);
reply_type = modest_conf_get_int (conf, reply_key, &error);
- if (error) {
+ if (error || reply_type == 0) {
g_warning ("key %s not defined", reply_key);
reply_type = MODEST_MAIL_OPERATION_REPLY_TYPE_CITE;
- g_error_free (error);
- error = NULL;
+ if (error) {
+ g_error_free (error);
+ error = NULL;
+ }
}
g_free (reply_key);
forward_key = g_strdup_printf ("%s/%s", MODEST_CONF_NAMESPACE, MODEST_CONF_FORWARD_TYPE);
- forward_type = modest_conf_get_int (conf, forward_key, NULL);
- if (error) {
+ forward_type = modest_conf_get_int (conf, forward_key, &error);
+ if (error || forward_type == 0) {
g_warning ("key %s not defined", forward_key);
- reply_type = MODEST_MAIL_OPERATION_FORWARD_TYPE_INLINE;
- g_error_free (error);
+ forward_type = MODEST_MAIL_OPERATION_FORWARD_TYPE_INLINE;
+ if (error) {
+ g_error_free (error);
+ error = NULL;
+ }
}
g_free (forward_key);
if (header_list) {
+ TnyHeader *header;
+ TnyFolder *folder;
+ gchar *from, *email_key;
+ const gchar *account_name;
+
+ /* We assume that we can only select messages of the
+ same folder and that we reply all of them from the
+ same account. In fact the interface currently only
+ allows single selection */
+ account_name = modest_folder_view_get_selected_account (priv->folder_view);
+ email_key = g_strdup_printf ("%s/%s/%s", MODEST_ACCOUNT_NAMESPACE,
+ account_name, MODEST_ACCOUNT_EMAIL);
+ from = modest_conf_get_string (conf, email_key, NULL);
+ g_free (email_key);
+
iter = tny_list_create_iterator (header_list);
+ header = TNY_HEADER (tny_iterator_get_current (iter));
+ folder = tny_header_get_folder (header);
+
do {
- TnyHeader *header, *new_header;
- TnyFolder *folder;
- TnyMsg *msg, *new_msg;
- ModestEditType edit_type;
+ /* Since it's not an object, we need to create
+ it each time due to it's not a GObject and
+ we can not do a g_object_ref. No need to
+ free it, tinymail will do it for us. */
+ helper = g_slice_new0 (GetMsgAsyncHelper);
+ helper->main_window_private = priv;
+ helper->reply_type = reply_type;
+ helper->forward_type = forward_type;
+ helper->action = action;
+ helper->from = from;
/* Get msg from header */
header = TNY_HEADER (tny_iterator_get_current (iter));
- folder = tny_header_get_folder (header);
- msg = tny_folder_get_msg (folder, header);
-
- from = modest_folder_view_get_selected_account (priv->folder_view);
-
- /* FIXME: select proper action */
- switch (action) {
- case 1:
- new_msg =
- modest_mail_operation_create_reply_mail (msg, from, reply_type,
- MODEST_MAIL_OPERATION_REPLY_MODE_SENDER);
- edit_type = MODEST_EDIT_TYPE_REPLY;
- break;
- case 2:
- new_msg =
- modest_mail_operation_create_reply_mail (msg, from, reply_type,
- MODEST_MAIL_OPERATION_REPLY_MODE_ALL);
- edit_type = MODEST_EDIT_TYPE_REPLY;
- break;
- case 3:
- new_msg =
- modest_mail_operation_create_forward_mail (msg, from, forward_type);
- edit_type = MODEST_EDIT_TYPE_FORWARD;
- break;
- default:
- g_warning ("unexpected action type: %d", action);
- }
-
- /* Set from */
- new_header = tny_msg_get_header (new_msg);
- tny_header_set_from (new_header,
- modest_folder_view_get_selected_account (priv->folder_view));
-
- /* Show edit window */
- msg_win = modest_edit_msg_window_new (priv->widget_factory,
- edit_type,
- new_msg);
- gtk_widget_show (msg_win);
-
- /* Clean and go on */
- g_object_unref (new_msg);
+ tny_folder_get_msg_async (folder, header, get_msg_cb, helper);
tny_iterator_next (iter);
} while (!tny_iterator_is_done (iter));
+
+ /* Clean */
+ g_free (from);
+ g_object_unref (G_OBJECT (iter));
+ g_object_unref (G_OBJECT (folder));
}
}
model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model));
do {
TnyHeader *header;
+ ModestMailOperation *mail_op;
header = TNY_HEADER (tny_iterator_get_current (iter));
+ /* TODO: thick grain mail operation involving
+ a list of objects. Composite pattern ??? */
+ mail_op = modest_mail_operation_new ();
+
+ /* Move to trash */
+ modest_mail_operation_remove_msg (mail_op, header, TRUE);
/* Remove from tree model */
tny_list_remove (TNY_LIST (model), G_OBJECT (header));
- /* Remove from server */
- modest_tny_msg_actions_remove (header);
-
+ g_object_unref (G_OBJECT (mail_op));
g_object_unref (header);
tny_iterator_next (iter);
header_view_new (ModestMainWindow *self)
{
int i;
- GSList *columns = NULL;
+ GList *columns = NULL;
ModestHeaderView *header_view;
ModestMainWindowPrivate *priv;
ModestHeaderViewColumn cols[] = {
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
for (i = 0 ; i != sizeof(cols) / sizeof(ModestHeaderViewColumn); ++i)
- columns = g_slist_append (columns, GINT_TO_POINTER(cols[i]));
+ columns = g_list_append (columns, GINT_TO_POINTER(cols[i]));
header_view = modest_widget_factory_get_header_view (priv->widget_factory);
modest_header_view_set_columns (header_view, columns);
- g_slist_free (columns);
+ g_list_free (columns);
return header_view;
}
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
- modest_widget_memory_restore_settings (conf,GTK_WIDGET(self),
- "modest-main-window");
- modest_widget_memory_restore_settings (conf, GTK_WIDGET(priv->folder_paned),
- "modest-folder-paned");
- modest_widget_memory_restore_settings (conf, GTK_WIDGET(priv->msg_paned),
- "modest-msg-paned");
- modest_widget_memory_restore_settings (conf, GTK_WIDGET(priv->main_paned),
- "modest-main-paned");
+ modest_widget_memory_restore (conf,G_OBJECT(self),
+ "modest-main-window");
+ modest_widget_memory_restore (conf, G_OBJECT(priv->folder_paned),
+ "modest-folder-paned");
+ modest_widget_memory_restore (conf, G_OBJECT(priv->msg_paned),
+ "modest-msg-paned");
+ modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
+ "modest-main-paned");
+ modest_widget_memory_restore (conf, G_OBJECT(priv->header_view),
+ "header-view");
}
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
- modest_widget_memory_save_settings (conf,GTK_WIDGET(self),
- "modest-main-window");
- modest_widget_memory_save_settings (conf, GTK_WIDGET(priv->folder_paned),
- "modest-folder-paned");
- modest_widget_memory_save_settings (conf, GTK_WIDGET(priv->msg_paned),
- "modest-msg-paned");
- modest_widget_memory_save_settings (conf, GTK_WIDGET(priv->main_paned),
- "modest-main-paned");
+ modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window");
+ modest_widget_memory_save (conf, G_OBJECT(priv->folder_paned),
+ "modest-folder-paned");
+ modest_widget_memory_save (conf, G_OBJECT(priv->msg_paned),
+ "modest-msg-paned");
+ modest_widget_memory_save (conf, G_OBJECT(priv->main_paned),
+ "modest-main-paned");
+ modest_widget_memory_save (conf, G_OBJECT(priv->header_view), "header-view");
}
static GtkWidget*
return FALSE;
}
-static GtkWidget*
-favorites_view ()
-{
- GtkWidget *favorites;
- GtkTreeStore *store;
- GtkTreeViewColumn *col;
-
- store = gtk_tree_store_new (1, G_TYPE_STRING);
- favorites = gtk_tree_view_new_with_model (GTK_TREE_MODEL(store));
- col = gtk_tree_view_column_new_with_attributes (_("Favorites"),
- gtk_cell_renderer_text_new(),
- "text", 0, NULL);
-
- gtk_tree_view_append_column (GTK_TREE_VIEW(favorites), col);
- gtk_widget_show_all (favorites);
-
- g_object_unref (G_OBJECT(store));
-
- return favorites;
-}
-
-
GtkWidget*
modest_main_window_new (ModestWidgetFactory *widget_factory)
GtkWidget *main_vbox;
GtkWidget *status_hbox;
- GtkWidget *header_win, *folder_win, *favorites_win;
+ GtkWidget *header_win, *folder_win;
g_return_val_if_fail (widget_factory, NULL);
FALSE);
header_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->header_view),
FALSE);
- favorites_win = wrapped_in_scrolled_window (favorites_view(),FALSE);
/* tool/menubar */
priv->menubar = menubar_new (MODEST_MAIN_WINDOW(obj));
priv->folder_paned = gtk_vpaned_new ();
priv->msg_paned = gtk_vpaned_new ();
priv->main_paned = gtk_hpaned_new ();
- gtk_paned_add1 (GTK_PANED(priv->main_paned), priv->folder_paned);
+ gtk_paned_add1 (GTK_PANED(priv->main_paned), folder_win);
gtk_paned_add2 (GTK_PANED(priv->main_paned), priv->msg_paned);
- gtk_paned_add1 (GTK_PANED(priv->folder_paned), favorites_win);
- gtk_paned_add2 (GTK_PANED(priv->folder_paned), folder_win);
gtk_paned_add1 (GTK_PANED(priv->msg_paned), header_win);
gtk_paned_add2 (GTK_PANED(priv->msg_paned), GTK_WIDGET(priv->msg_preview));
projects / modest / blobdiff