aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-05-07 00:34:33 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:10 +0800
commit7aa164895ce4e4ba760af1415e45d7b264d2d2c3 (patch)
tree2a802f3474dd9a2ecd21c1379c7fb11ba938896b /modules/mail
parent0b1897d7d8a364263f980b29ba8eaaf9181323b1 (diff)
downloadgsoc2013-evolution-7aa164895ce4e4ba760af1415e45d7b264d2d2c3.tar
gsoc2013-evolution-7aa164895ce4e4ba760af1415e45d7b264d2d2c3.tar.gz
gsoc2013-evolution-7aa164895ce4e4ba760af1415e45d7b264d2d2c3.tar.bz2
gsoc2013-evolution-7aa164895ce4e4ba760af1415e45d7b264d2d2c3.tar.lz
gsoc2013-evolution-7aa164895ce4e4ba760af1415e45d7b264d2d2c3.tar.xz
gsoc2013-evolution-7aa164895ce4e4ba760af1415e45d7b264d2d2c3.tar.zst
gsoc2013-evolution-7aa164895ce4e4ba760af1415e45d7b264d2d2c3.zip
em_folder_utils_create_folder(): Change function parameters.
Take a folder URI string instead of a CamelFolderInfo, and swap places with the GtkWindow parameter.
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-shell-backend.c2
-rw-r--r--modules/mail/e-mail-shell-view-actions.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index c29dbdcbcc..180e5b2a92 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -140,7 +140,7 @@ action_mail_folder_new_cb (GtkAction *action,
exit:
em_folder_utils_create_folder (
- NULL, folder_tree, mail_session, GTK_WINDOW (shell_window));
+ GTK_WINDOW (shell_window), folder_tree, mail_session, NULL);
}
static void
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index a2b6f18133..f311246da7 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -385,23 +385,23 @@ action_mail_folder_new_cb (GtkAction *action,
EShellWindow *shell_window;
EMailSession *session;
EMailShellSidebar *mail_shell_sidebar;
- 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);
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);
+
session = em_folder_tree_get_session (folder_tree);
- g_return_if_fail (folder_info != NULL);
+ selected_uri = em_folder_tree_get_selected_uri (folder_tree);
em_folder_utils_create_folder (
- folder_info, folder_tree, session,
- GTK_WINDOW (shell_window));
+ GTK_WINDOW (shell_window),
+ folder_tree, session, selected_uri);
- camel_folder_info_free (folder_info);
+ g_free (selected_uri);
}
static void