diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | plugins/mark-all-read/mark-all-read.c | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 80bde6b9c1..f4208e86c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1790,7 +1790,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-source external-editor google-account-setup hula-account-setup imap-features mail-notification plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-source external-editor google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ @@ -1806,7 +1806,6 @@ dnl ipod-sync dnl itip-formatter dnl mailing-list-actions dnl mail-to-task -dnl mark-all-read dnl mono dnl prefer-plain dnl pst-import diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index 2001bcc8bc..0a59b69f33 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -29,7 +29,6 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <e-util/e-plugin-ui.h> -#include <mail/e-mail-shell-sidebar.h> #include <mail/em-folder-tree.h> #include <mail/mail-ops.h> #include <mail/mail-mt.h> @@ -37,6 +36,7 @@ #include "e-util/e-error.h" #include <shell/e-shell-sidebar.h> +#include <shell/e-shell-view.h> #include <shell/e-shell-window.h> #include <shell/e-shell-window-actions.h> @@ -272,16 +272,12 @@ static void action_mail_mark_read_recursive_cb (GtkAction *action, EShellView *shell_view) { - EMailShellSidebar *mail_shell_sidebar; EShellSidebar *shell_sidebar; EMFolderTree *folder_tree; const gchar *folder_uri; shell_sidebar = e_shell_view_get_shell_sidebar (shell_view); - g_return_if_fail (E_IS_MAIL_SHELL_SIDEBAR (shell_sidebar)); - - mail_shell_sidebar = E_MAIL_SHELL_SIDEBAR (shell_sidebar); - folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar); + g_object_get (shell_sidebar, "folder-tree", &folder_tree, NULL); folder_uri = em_folder_tree_get_selected_uri (folder_tree); g_return_if_fail (folder_uri != NULL); |