gint
modest_platform_run_confirmation_dialog (GtkWindow *parent_window,
- ModestConfirmationDialogType type,
- gpointer user_data)
+ const gchar *message)
{
GtkWidget *dialog;
gint response;
- gchar *message = NULL;
- TnyFolder *folder;
-
- switch (type) {
- case MODEST_CONFIRMATION_DELETE_FOLDER:
- folder = TNY_FOLDER (user_data);
- message = g_strdup_printf (_("mcen_nc_delete_folder_text"),
- tny_folder_get_name (folder));
- break;
- };
dialog = hildon_note_new_confirmation (parent_window, message);
response = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (GTK_WIDGET (dialog));
- g_free (message);
return response;
}
trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(store_account),
TNY_FOLDER_TYPE_TRASH);
if (trash_folder) {
- modest_mail_operation_xfer_msg (self, header, trash_folder, TRUE);
+ TnyList *headers;
+
+ /* Create list */
+ headers = tny_simple_list_new ();
+ tny_list_append (headers, G_OBJECT (header));
+ g_object_unref (header);
+
+ /* Move to trash */
+ modest_mail_operation_xfer_msgs (self, headers, trash_folder, TRUE);
+ g_object_unref (headers);
/* g_object_unref (trash_folder); */
} else {
ModestMailOperationPrivate *priv;
}
void
-modest_mail_operation_xfer_msg (ModestMailOperation *self,
- TnyHeader *header,
- TnyFolder *folder,
- gboolean delete_original)
+modest_mail_operation_xfer_msgs (ModestMailOperation *self,
+ TnyList *headers,
+ TnyFolder *folder,
+ gboolean delete_original)
{
ModestMailOperationPrivate *priv;
+ TnyIterator *iter;
TnyFolder *src_folder;
- TnyList *headers;
XFerMsgAsyncHelper *helper;
+ TnyHeader *header;
g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
- g_return_if_fail (TNY_IS_HEADER (header));
+ g_return_if_fail (TNY_IS_LIST (headers));
g_return_if_fail (TNY_IS_FOLDER (folder));
/* Pick references for async calls */
g_object_ref (folder);
- headers = tny_simple_list_new ();
- tny_list_prepend (headers, G_OBJECT (header));
-
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
priv->total = 1;
priv->done = 0;
helper->dest_folder = folder;
helper->headers = headers;
+ /* Get source folder */
+ iter = tny_list_create_iterator (headers);
+ header = TNY_HEADER (tny_iterator_get_current (iter));
src_folder = tny_header_get_folder (header);
+ g_object_unref (header);
+ g_object_unref (iter);
+
+ /* Transfer messages */
tny_folder_transfer_msgs_async (src_folder,
headers,
folder,
/* Functions that performs msg operations */
/**
- * modest_mail_operation_xfer_msg:
+ * modest_mail_operation_xfer_msgs:
* @self: a #ModestMailOperation
- * @header: the #TnyHeader of the message to move
- * @folder: the #TnyFolder where the message will be moved
- * @delete_original: whether or not delete the source message
+ * @header_list: a #TnyList of #TnyHeader to transfer
+ * @folder: the #TnyFolder where the messages will be transferred
+ * @delete_original: whether or not delete the source messages
*
- * Asynchronously transfers a message from its current folder to
+ * Asynchronously transfers messages from their current folder to
* another one. The caller should add the #ModestMailOperation to a
* #ModestMailOperationQueue and then free it. The caller will be
* notified by the "progress_changed" when the operation is completed.
*
* If the @delete_original paramter is TRUE then this function moves
- * the message between folders, otherwise it copies it.
+ * the messages between folders, otherwise it copies them.
*
* Example
* <informalexample><programlisting>
* modest_mail_operation_queue_add (queue, mail_op);
* g_signal_connect (G_OBJECT (mail_op), "progress_changed", G_CALLBACK(on_progress_changed), queue);
*
- * modest_mail_operation_xfer_msg (mail_op, header, folder, TRUE);
+ * modest_mail_operation_xfer_msg (mail_op, headers, folder, TRUE);
*
* g_object_unref (G_OBJECT (mail_op));
* </programlisting></informalexample>
*
**/
-void modest_mail_operation_xfer_msg (ModestMailOperation *self,
- TnyHeader *header,
+void modest_mail_operation_xfer_msgs (ModestMailOperation *self,
+ TnyList *header_list,
TnyFolder *folder,
gboolean delete_original);
/**
* modest_platform_run_confirmation_dialog:
* @parent_window: the parent #GtkWindow of the dialog
- * @type: the type of confirmation dialog
- * @user_data: user data
+ * @message: the message to show to the user
*
- * runs a confirmation dialog of type #type.
+ * runs a confirmation dialog
*
* Returns: GTK_RESPONSE_OK or GTK_RESPONSE_CANCEL
**/
gint modest_platform_run_confirmation_dialog (GtkWindow *parent_window,
- ModestConfirmationDialogType type,
- gpointer user_data);
+ const gchar *message);
/**
TnyFolderStore *folder;
GtkWidget *folder_view;
gint response;
+ gchar *message;
g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
/* Ask the user */
+ message = g_strdup_printf (_("mcen_nc_delete_folder_text"),
+ tny_folder_get_name (TNY_FOLDER (folder)));
response = modest_platform_run_confirmation_dialog (GTK_WINDOW (main_window),
- MODEST_CONFIRMATION_DELETE_FOLDER,
- folder);
+ (const gchar *) message);
+ g_free (message);
if (response == GTK_RESPONSE_OK) {
ModestMailOperation *mail_op = modest_mail_operation_new ();
{
GtkWidget *dialog, *scroll, *folder_view, *tree_view;
gint result;
+ TnyFolderStore *folder_store;
+ ModestMailOperation *mail_op;
+ ModestMainWindow *main_window;
- g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (win) ||
+ MODEST_IS_MSG_VIEW_WINDOW (win));
dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
GTK_WINDOW (win),
GTK_POLICY_AUTOMATIC);
/* Create folder view */
- folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+ main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
+
+ folder_view = modest_main_window_get_child_widget (main_window,
MODEST_WIDGET_TYPE_FOLDER_VIEW);
tree_view = modest_folder_view_new (NULL);
gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
result = gtk_dialog_run (GTK_DIALOG(dialog));
- if (result == GTK_RESPONSE_ACCEPT) {
- TnyFolderStore *folder_store;
- folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
- if (TNY_IS_ACCOUNT (folder_store)) {
- } else {
- ModestMailOperation *mail_op;
- /* Create mail operation */
- mail_op = modest_mail_operation_new ();
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
+ /* We do this to save an indentation level ;-) */
+ if (result != GTK_RESPONSE_ACCEPT)
+ goto end;
- /* Get folder or messages to transfer */
- if (gtk_widget_is_focus (folder_view)) {
- TnyFolderStore *src_folder;
- src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+ folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
- if (TNY_IS_FOLDER (src_folder))
- modest_mail_operation_xfer_folder (mail_op,
- TNY_FOLDER (src_folder),
- folder_store,
- TRUE);
+ /* We use the goto to save an indentation level ;-) */
+ if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+ TnyMsg *msg;
+ TnyHeader *header;
+ TnyList *headers;
- /* Frees */
- g_object_unref (G_OBJECT (src_folder));
- } else {
- }
- g_object_unref (G_OBJECT (mail_op));
+ /* Create header list */
+ msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
+ header = tny_msg_get_header (msg);
+ headers = tny_simple_list_new ();
+ tny_list_prepend (headers, G_OBJECT (header));
+ g_object_unref (header);
+ g_object_unref (msg);
+
+ /* Transfer current msg */
+ modest_mail_operation_xfer_msgs (mail_op,
+ headers,
+ TNY_FOLDER (folder_store),
+ TRUE);
+ goto end;
+ }
+
+ if (TNY_IS_ACCOUNT (folder_store))
+ goto end;
+
+ /* Create mail operation */
+ mail_op = modest_mail_operation_new ();
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+
+ /* Get folder or messages to transfer */
+ if (gtk_widget_is_focus (folder_view)) {
+ TnyFolderStore *src_folder;
+ src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+ if (TNY_IS_FOLDER (src_folder))
+ modest_mail_operation_xfer_folder (mail_op,
+ TNY_FOLDER (src_folder),
+ folder_store,
+ TRUE);
+
+ /* Frees */
+ g_object_unref (G_OBJECT (src_folder));
+ } else {
+ GtkWidget *header_view;
+ header_view = modest_main_window_get_child_widget (main_window,
+ MODEST_WIDGET_TYPE_HEADER_VIEW);
+ if (gtk_widget_is_focus (header_view)) {
+ TnyList *headers;
+
+ headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view));
+
+ /* Transfer messages */
+ modest_mail_operation_xfer_msgs (mail_op,
+ headers,
+ TNY_FOLDER (folder_store),
+ TRUE);
}
- g_object_unref (folder_store);
}
+ g_object_unref (G_OBJECT (mail_op));
+
+ g_object_unref (folder_store);
+ end:
gtk_widget_destroy (dialog);
}
/*
* This function is the callback of the
- * modest_mail_operation_xfer_msg() and
+ * modest_mail_operation_xfer_msgs () and
* modest_mail_operation_xfer_folder() calls. We check here if the
* message/folder was correctly asynchronously transferred. The reason
* to use the same callback is that the code is the same, it only has
GtkTreePath *dest_row,
DndHelper *helper)
{
+ TnyList *headers;
TnyHeader *header;
TnyFolder *folder;
ModestMailOperation *mail_op;
/* Transfer message */
mail_op = modest_mail_operation_new ();
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
g_signal_connect (G_OBJECT (mail_op), "progress-changed",
G_CALLBACK (on_progress_changed), helper);
- modest_mail_operation_xfer_msg (mail_op, header, folder, helper->delete_source);
+ /* FIXME: I replaced this because the API changed, but D&D
+ should be reviewed in order to allow multiple drags*/
+ headers = tny_simple_list_new ();
+ tny_list_append (headers, G_OBJECT (header));
+ g_object_unref (header);
+ modest_mail_operation_xfer_msgs (mail_op, headers, folder, helper->delete_source);
/* Frees */
g_object_unref (G_OBJECT (mail_op));
typedef struct _ModestWindowMgrPrivate ModestWindowMgrPrivate;
struct _ModestWindowMgrPrivate {
GList *window_list;
+ ModestWindow *main_window;
gboolean fullscreen_mode;
gboolean show_toolbars;
gboolean show_toolbars_fullscreen;
priv = MODEST_WINDOW_MGR_GET_PRIVATE(obj);
priv->window_list = NULL;
+ priv->main_window = NULL;
priv->fullscreen_mode = FALSE;
/* Could not initialize it from gconf, singletons are not
priv->window_list = NULL;
}
+ /* Do not unref priv->main_window because it does not hold a
+ new reference */
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
return;
}
+ /* Check that it's not a second main window */
+ if (MODEST_IS_MAIN_WINDOW (window)) {
+ if (priv->main_window) {
+ g_warning ("Trying to register a second main window");
+ return;
+ } else {
+ priv->main_window = window;
+ }
+ }
+
/* Add to list. Keep a reference to the window */
g_object_ref (window);
priv->window_list = g_list_prepend (priv->window_list, window);
}
}
}
+
+ModestWindow*
+modest_window_mgr_get_main_window (ModestWindowMgr *self)
+{
+ ModestWindowMgrPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
+
+ priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+ return priv->main_window;
+}
void modest_window_mgr_show_toolbars (ModestWindowMgr *self,
gboolean show_toolbars,
gboolean fullscreen);
+
+ModestWindow* modest_window_mgr_get_main_window (ModestWindowMgr *self);
+
G_END_DECLS
#endif /* __MODEST_WINDOW_MGR_H__ */
projects / modest / commitdiff