diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-02-19 08:35:59 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:36 +0800 |
| commit | 3b6c8972a51d635309b789b1aef9034ca23dc737 (patch) | |
| tree | 3e2843b8f664df4c022b6cf755828a1296fd5718 /modules | |
| parent | 333ccc8abf033453996e4a7e16712f2fc3b9e05a (diff) | |
| download | gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar.gz gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar.bz2 gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar.lz gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar.xz gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar.zst gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.zip | |
Coding style and whitespace cleanup.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/addressbook/e-book-shell-content.c | 1 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 10 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 6 |
3 files changed, 13 insertions, 4 deletions
diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c index a2f7f9cddd..b4bd8d2ac3 100644 --- a/modules/addressbook/e-book-shell-content.c +++ b/modules/addressbook/e-book-shell-content.c @@ -272,7 +272,6 @@ book_shell_content_constructed (GObject *object) widget, "orientation", G_BINDING_SYNC_CREATE); - e_shell_configure_web_view (shell, E_WEB_VIEW (widget)); gtk_widget_show (widget); diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 601b8e0c25..d5096c6185 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -117,11 +117,17 @@ action_mail_folder_new_cb (GtkAction *action, view_name = e_shell_window_get_active_view (shell_window); if (g_strcmp0 (view_name, BACKEND_NAME) != 0) { EShellBackend *mail_backend; + EShell *shell; - mail_backend = e_shell_get_backend_by_name (e_shell_window_get_shell (shell_window), BACKEND_NAME); + shell = e_shell_window_get_shell (shell_window); + + mail_backend = + e_shell_get_backend_by_name (shell, BACKEND_NAME); g_return_if_fail (mail_backend != NULL); - mail_session = e_mail_backend_get_session (E_MAIL_BACKEND (mail_backend)); + mail_session = + e_mail_backend_get_session ( + E_MAIL_BACKEND (mail_backend)); g_return_if_fail (mail_session != NULL); goto exit; diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index e0a445abdd..2836b1bd09 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -381,6 +381,7 @@ action_mail_folder_new_cb (GtkAction *action, { EShellView *shell_view; EShellWindow *shell_window; + EMailSession *session; EMailShellSidebar *mail_shell_sidebar; CamelFolderInfo *folder_info; EMFolderTree *folder_tree; @@ -391,10 +392,13 @@ action_mail_folder_new_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); + session = em_folder_tree_get_session (folder_tree); g_return_if_fail (folder_info != NULL); em_folder_utils_create_folder ( - folder_info, folder_tree, em_folder_tree_get_session (folder_tree), GTK_WINDOW (shell_window)); + folder_info, folder_tree, session, + GTK_WINDOW (shell_window)); + camel_folder_info_free (folder_info); } |