"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/modules/mail/e-mail-shell-view-actions.c" between
evolution-3.32.4.tar.xz and evolution-3.34.0.tar.xz

About: Evolution is a personal information management application that provides integrated mail, calendaring and address book functionality (GNOME desktop).

e-mail-shell-view-actions.c  (evolution-3.32.4.tar.xz):e-mail-shell-view-actions.c  (evolution-3.34.0.tar.xz)
skipping to change at line 23 skipping to change at line 23
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
* *
* *
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
* *
*/ */
#include "evolution-config.h" #include "evolution-config.h"
#include "mail/e-mail-folder-sort-order-dialog.h"
#include "e-mail-shell-view-private.h" #include "e-mail-shell-view-private.h"
static void static void
mail_shell_view_folder_created_cb (EMailFolderCreateDialog *dialog, mail_shell_view_folder_created_cb (EMailFolderCreateDialog *dialog,
CamelStore *store, CamelStore *store,
const gchar *folder_name, const gchar *folder_name,
GWeakRef *folder_tree_weak_ref) GWeakRef *folder_tree_weak_ref)
{ {
EMFolderTree *folder_tree; EMFolderTree *folder_tree;
skipping to change at line 442 skipping to change at line 444
e_mail_reader_delete_folder_name ( e_mail_reader_delete_folder_name (
E_MAIL_READER (mail_view), E_MAIL_READER (mail_view),
selected_store, selected_folder_name); selected_store, selected_folder_name);
g_object_unref (selected_store); g_object_unref (selected_store);
g_free (selected_folder_name); g_free (selected_folder_name);
} }
static void static void
action_mail_folder_edit_sort_order_cb (GtkAction *action,
EMailShellView *mail_shell_view)
{
EMailView *mail_view;
EMFolderTree *folder_tree;
CamelStore *store;
GtkWidget *dialog;
GtkWindow *window;
gchar *selected_uri;
folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_view->priv
->mail_shell_sidebar);
store = em_folder_tree_ref_selected_store (folder_tree);
g_return_if_fail (store != NULL);
selected_uri = em_folder_tree_get_selected_uri (folder_tree);
mail_view = e_mail_shell_content_get_mail_view (mail_shell_view->priv->ma
il_shell_content);
window = e_mail_reader_get_window (E_MAIL_READER (mail_view));
dialog = e_mail_folder_sort_order_dialog_new (window, store, selected_uri
);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
g_object_unref (store);
g_free (selected_uri);
}
static void
action_mail_folder_expunge_cb (GtkAction *action, action_mail_folder_expunge_cb (GtkAction *action,
EMailShellView *mail_shell_view) EMailShellView *mail_shell_view)
{ {
EMailShellContent *mail_shell_content; EMailShellContent *mail_shell_content;
EMailShellSidebar *mail_shell_sidebar; EMailShellSidebar *mail_shell_sidebar;
EMailView *mail_view; EMailView *mail_view;
EMFolderTree *folder_tree; EMFolderTree *folder_tree;
CamelStore *selected_store = NULL; CamelStore *selected_store = NULL;
gchar *selected_folder_name = NULL; gchar *selected_folder_name = NULL;
skipping to change at line 821 skipping to change at line 853
context->activity = e_activity_new (); context->activity = e_activity_new ();
g_queue_init (&context->folder_names); g_queue_init (&context->folder_names);
alert_sink = E_ALERT_SINK (shell_content); alert_sink = E_ALERT_SINK (shell_content);
e_activity_set_alert_sink (context->activity, alert_sink); e_activity_set_alert_sink (context->activity, alert_sink);
cancellable = camel_operation_new (); cancellable = camel_operation_new ();
e_activity_set_cancellable (context->activity, cancellable); e_activity_set_cancellable (context->activity, cancellable);
camel_operation_push_message ( camel_operation_push_message (
cancellable, _("Marking messages as read...")); cancellable, _("Marking messages as read"));
e_shell_backend_add_activity (shell_backend, context->activity); e_shell_backend_add_activity (shell_backend, context->activity);
camel_store_get_folder_info ( camel_store_get_folder_info (
store, folder_name, store, folder_name,
can_subfolders ? CAMEL_STORE_FOLDER_INFO_RECURSIVE : 0, can_subfolders ? CAMEL_STORE_FOLDER_INFO_RECURSIVE : 0,
G_PRIORITY_DEFAULT, cancellable, G_PRIORITY_DEFAULT, cancellable,
mark_all_read_got_folder_info, context); mark_all_read_got_folder_info, context);
g_object_unref (cancellable); g_object_unref (cancellable);
skipping to change at line 1589 skipping to change at line 1621
{ "mail-flush-outbox", { "mail-flush-outbox",
"mail-send", "mail-send",
N_("Fl_ush Outbox"), N_("Fl_ush Outbox"),
NULL, NULL,
NULL, /* XXX Add a tooltip! */ NULL, /* XXX Add a tooltip! */
G_CALLBACK (action_mail_flush_outbox_cb) }, G_CALLBACK (action_mail_flush_outbox_cb) },
{ "mail-folder-copy", { "mail-folder-copy",
"folder-copy", "folder-copy",
N_("_Copy Folder To..."), N_("_Copy Folder To"),
NULL, NULL,
N_("Copy the selected folder into another folder"), N_("Copy the selected folder into another folder"),
G_CALLBACK (action_mail_folder_copy_cb) }, G_CALLBACK (action_mail_folder_copy_cb) },
{ "mail-folder-delete", { "mail-folder-delete",
"edit-delete", "edit-delete",
N_("_Delete"), N_("_Delete"),
NULL, NULL,
N_("Permanently remove this folder"), N_("Permanently remove this folder"),
G_CALLBACK (action_mail_folder_delete_cb) }, G_CALLBACK (action_mail_folder_delete_cb) },
{ "mail-folder-edit-sort-order",
NULL,
N_("Edit Sort _Order…"),
NULL,
N_("Change sort order of the folders in the folder tree"),
G_CALLBACK (action_mail_folder_edit_sort_order_cb) },
{ "mail-folder-expunge", { "mail-folder-expunge",
NULL, NULL,
N_("E_xpunge"), N_("E_xpunge"),
"<Control>e", "<Control>e",
N_("Permanently remove all deleted messages from this folder"), N_("Permanently remove all deleted messages from this folder"),
G_CALLBACK (action_mail_folder_expunge_cb) }, G_CALLBACK (action_mail_folder_expunge_cb) },
{ "mail-folder-mark-all-as-read", { "mail-folder-mark-all-as-read",
"mail-mark-read", "mail-mark-read",
N_("Mar_k All Messages as Read"), N_("Mar_k All Messages as Read"),
"<Control>slash", "<Control>slash",
N_("Mark all messages in the folder as read"), N_("Mark all messages in the folder as read"),
G_CALLBACK (action_mail_folder_mark_all_as_read_cb) }, G_CALLBACK (action_mail_folder_mark_all_as_read_cb) },
{ "mail-folder-move", { "mail-folder-move",
"folder-move", "folder-move",
N_("_Move Folder To..."), N_("_Move Folder To"),
NULL, NULL,
N_("Move the selected folder into another folder"), N_("Move the selected folder into another folder"),
G_CALLBACK (action_mail_folder_move_cb) }, G_CALLBACK (action_mail_folder_move_cb) },
{ "mail-folder-new", { "mail-folder-new",
"folder-new", "folder-new",
/* Translators: An action caption to create a new mail folder */ /* Translators: An action caption to create a new mail folder */
N_("_New..."), N_("_New"),
NULL, NULL,
N_("Create a new folder for storing mail"), N_("Create a new folder for storing mail"),
G_CALLBACK (action_mail_folder_new_cb) }, G_CALLBACK (action_mail_folder_new_cb) },
{ "mail-folder-properties", { "mail-folder-properties",
"document-properties", "document-properties",
N_("_Properties"), N_("_Properties"),
NULL, NULL,
N_("Change the properties of this folder"), N_("Change the properties of this folder"),
G_CALLBACK (action_mail_folder_properties_cb) }, G_CALLBACK (action_mail_folder_properties_cb) },
{ "mail-folder-refresh", { "mail-folder-refresh",
"view-refresh", "view-refresh",
N_("_Refresh"), N_("_Refresh"),
"F5", "F5",
N_("Refresh the folder"), N_("Refresh the folder"),
G_CALLBACK (action_mail_folder_refresh_cb) }, G_CALLBACK (action_mail_folder_refresh_cb) },
{ "mail-folder-rename", { "mail-folder-rename",
NULL, NULL,
N_("_Rename..."), N_("_Rename"),
"F2", "F2",
N_("Change the name of this folder"), N_("Change the name of this folder"),
G_CALLBACK (action_mail_folder_rename_cb) }, G_CALLBACK (action_mail_folder_rename_cb) },
{ "mail-folder-select-thread", { "mail-folder-select-thread",
NULL, NULL,
N_("Select Message _Thread"), N_("Select Message _Thread"),
"<Control>h", "<Control>h",
N_("Select all messages in the same thread as the selected message"), N_("Select all messages in the same thread as the selected message"),
G_CALLBACK (action_mail_folder_select_thread_cb) }, G_CALLBACK (action_mail_folder_select_thread_cb) },
skipping to change at line 1779 skipping to change at line 1818
{ "mail-tools-filters", { "mail-tools-filters",
NULL, NULL,
N_("_Message Filters"), N_("_Message Filters"),
NULL, NULL,
N_("Create or edit rules for filtering new mail"), N_("Create or edit rules for filtering new mail"),
G_CALLBACK (action_mail_tools_filters_cb) }, G_CALLBACK (action_mail_tools_filters_cb) },
{ "mail-tools-subscriptions", { "mail-tools-subscriptions",
NULL, NULL,
N_("_Subscriptions..."), N_("_Subscriptions"),
NULL, NULL,
N_("Subscribe or unsubscribe to folders on remote servers"), N_("Subscribe or unsubscribe to folders on remote servers"),
G_CALLBACK (action_mail_tools_subscriptions_cb) }, G_CALLBACK (action_mail_tools_subscriptions_cb) },
/*** Menus ***/ /*** Menus ***/
{ "mail-folder-menu", { "mail-folder-menu",
NULL, NULL,
N_("F_older"), N_("F_older"),
NULL, NULL,
skipping to change at line 1805 skipping to change at line 1844
N_("_Preview"), N_("_Preview"),
NULL, NULL,
NULL, NULL,
NULL } NULL }
}; };
static GtkActionEntry search_folder_entries[] = { static GtkActionEntry search_folder_entries[] = {
{ "mail-create-search-folder", { "mail-create-search-folder",
NULL, NULL,
N_("C_reate Search Folder From Search..."), N_("C_reate Search Folder From Search"),
NULL, NULL,
NULL, /* XXX Add a tooltip! */ NULL, /* XXX Add a tooltip! */
G_CALLBACK (action_mail_create_search_folder_cb) }, G_CALLBACK (action_mail_create_search_folder_cb) },
{ "mail-tools-search-folders", { "mail-tools-search-folders",
NULL, NULL,
N_("Search F_olders"), N_("Search F_olders"),
NULL, NULL,
N_("Create or edit search folder definitions"), N_("Create or edit search folder definitions"),
G_CALLBACK (action_mail_tools_search_folders_cb) }, G_CALLBACK (action_mail_tools_search_folders_cb) },
skipping to change at line 1857 skipping to change at line 1896
{ "mail-popup-folder-delete", { "mail-popup-folder-delete",
NULL, NULL,
"mail-folder-delete" }, "mail-folder-delete" },
{ "mail-popup-folder-move", { "mail-popup-folder-move",
NULL, NULL,
"mail-folder-move" }, "mail-folder-move" },
{ "mail-popup-folder-new", { "mail-popup-folder-new",
N_("_New Folder..."), N_("_New Folder"),
"mail-folder-new" }, "mail-folder-new" },
{ "mail-popup-folder-properties", { "mail-popup-folder-properties",
NULL, NULL,
"mail-folder-properties" }, "mail-folder-properties" },
{ "mail-popup-folder-refresh", { "mail-popup-folder-refresh",
NULL, NULL,
"mail-folder-refresh" }, "mail-folder-refresh" },
 End of changes. 11 change blocks. 
8 lines changed or deleted 50 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)