aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail/e-mail-shell-view-actions.c
diff options
context:
space:
mode:
Diffstat (limited to 'modules/mail/e-mail-shell-view-actions.c')
-rw-r--r--modules/mail/e-mail-shell-view-actions.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index d20b22455c..a2b6f18133 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -210,8 +210,8 @@ action_mail_folder_copy_cb (GtkAction *action,
EShellBackend *shell_backend;
EShellWindow *shell_window;
EShellView *shell_view;
- CamelFolderInfo *folder_info;
EMFolderTree *folder_tree;
+ gchar *selected_uri;
shell_view = E_SHELL_VIEW (mail_shell_view);
shell_window = e_shell_view_get_shell_window (shell_view);
@@ -219,14 +219,15 @@ action_mail_folder_copy_cb (GtkAction *action,
mail_shell_sidebar = mail_shell_view->priv->mail_shell_sidebar;
folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar);
- folder_info = em_folder_tree_get_selected_folder_info (folder_tree);
- g_return_if_fail (folder_info != NULL);
+ selected_uri = em_folder_tree_get_selected_uri (folder_tree);
+ g_return_if_fail (selected_uri != NULL);
- /* XXX Leaking folder_info? */
em_folder_utils_copy_folder (
GTK_WINDOW (shell_window),
E_MAIL_BACKEND (shell_backend),
- folder_info, FALSE);
+ selected_uri, FALSE);
+
+ g_free (selected_uri);
}
static void
@@ -356,8 +357,8 @@ action_mail_folder_move_cb (GtkAction *action,
EShellBackend *shell_backend;
EShellWindow *shell_window;
EShellView *shell_view;
- CamelFolderInfo *folder_info;
EMFolderTree *folder_tree;
+ gchar *selected_uri;
shell_view = E_SHELL_VIEW (mail_shell_view);
shell_window = e_shell_view_get_shell_window (shell_view);
@@ -365,14 +366,15 @@ action_mail_folder_move_cb (GtkAction *action,
mail_shell_sidebar = mail_shell_view->priv->mail_shell_sidebar;
folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar);
- folder_info = em_folder_tree_get_selected_folder_info (folder_tree);
- g_return_if_fail (folder_info != NULL);
+ selected_uri = em_folder_tree_get_selected_uri (folder_tree);
+ g_return_if_fail (selected_uri != NULL);
- /* XXX Leaking folder_info? */
em_folder_utils_copy_folder (
GTK_WINDOW (shell_window),
E_MAIL_BACKEND (shell_backend),
- folder_info, TRUE);
+ selected_uri, TRUE);
+
+ g_free (selected_uri);
}
static void