aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/e-mail-folder-pane.c4
-rw-r--r--mail/e-mail-notebook-view.c2
-rw-r--r--mail/e-mail-reader-utils.c9
-rw-r--r--mail/e-mail-reader.c4
-rw-r--r--mail/em-account-editor.c3
5 files changed, 1 insertions, 21 deletions
diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c
index 1527b14771..1c5f8e3032 100644
--- a/mail/e-mail-folder-pane.c
+++ b/mail/e-mail-folder-pane.c
@@ -71,7 +71,6 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
gint i;
GtkWindow *window;
CamelFolder *folder;
- const gchar *folder_uri;
GPtrArray *views;
guint n_views, ii;
@@ -89,7 +88,6 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
}
folder = e_mail_reader_get_folder (reader);
- folder_uri = e_mail_reader_get_folder_uri (reader);
if (em_utils_folder_is_drafts (folder) ||
em_utils_folder_is_outbox (folder) ||
em_utils_folder_is_templates (folder)) {
@@ -103,7 +101,6 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
const gchar *uid = uids->pdata[ii];
CamelFolder *real_folder;
CamelMessageInfo *info;
- const gchar *real_folder_uri;
gchar *real_uid;
if (!CAMEL_IS_VEE_FOLDER (folder)) {
@@ -118,7 +115,6 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
real_folder = camel_vee_folder_get_location (
CAMEL_VEE_FOLDER (folder),
(CamelVeeMessageInfo *) info, &real_uid);
- real_folder_uri = camel_folder_get_uri (real_folder);
if (em_utils_folder_is_drafts (real_folder) ||
em_utils_folder_is_outbox (real_folder)) {
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c
index d5a7965bab..0a73508cbf 100644
--- a/mail/e-mail-notebook-view.c
+++ b/mail/e-mail-notebook-view.c
@@ -890,7 +890,6 @@ mail_netbook_view_open_mail (EMailView *view,
{
EMailNotebookViewPrivate *priv;
EShellView *shell_view;
- const gchar *folder_uri;
CamelFolder *folder;
EMailView *pane;
gint page;
@@ -922,7 +921,6 @@ mail_netbook_view_open_mail (EMailView *view,
gtk_widget_show (GTK_WIDGET (pane));
folder = e_mail_reader_get_folder (E_MAIL_READER (view));
- folder_uri = e_mail_reader_get_folder_uri (E_MAIL_READER (view));
info = camel_folder_get_message_info (folder, uid);
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index cccc728cd3..5953f64006 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -222,14 +222,12 @@ e_mail_reader_open_selected (EMailReader *reader)
GtkWindow *window;
GPtrArray *views;
GPtrArray *uids;
- const gchar *folder_uri;
guint ii;
g_return_val_if_fail (E_IS_MAIL_READER (reader), 0);
backend = e_mail_reader_get_backend (reader);
folder = e_mail_reader_get_folder (reader);
- folder_uri = e_mail_reader_get_folder_uri (reader);
uids = e_mail_reader_get_selected_uids (reader);
window = e_mail_reader_get_window (reader);
@@ -255,7 +253,6 @@ e_mail_reader_open_selected (EMailReader *reader)
const gchar *uid = uids->pdata[ii];
CamelFolder *real_folder;
CamelMessageInfo *info;
- const gchar *real_folder_uri;
gchar *real_uid;
if (!CAMEL_IS_VEE_FOLDER (folder)) {
@@ -270,7 +267,6 @@ e_mail_reader_open_selected (EMailReader *reader)
real_folder = camel_vee_folder_get_location (
CAMEL_VEE_FOLDER (folder),
(CamelVeeMessageInfo *) info, &real_uid);
- real_folder_uri = camel_folder_get_uri (real_folder);
if (em_utils_folder_is_drafts (real_folder) ||
em_utils_folder_is_outbox (real_folder)) {
@@ -535,7 +531,6 @@ e_mail_reader_create_filter_from_selected (EMailReader *reader,
EMailSession *session;
CamelFolder *folder;
const gchar *filter_source;
- const gchar *folder_uri;
GPtrArray *uids;
struct {
@@ -546,12 +541,10 @@ e_mail_reader_create_filter_from_selected (EMailReader *reader,
g_return_if_fail (E_IS_MAIL_READER (reader));
+ folder = e_mail_reader_get_folder (reader);
backend = e_mail_reader_get_backend (reader);
session = e_mail_backend_get_session (backend);
- folder = e_mail_reader_get_folder (reader);
- folder_uri = e_mail_reader_get_folder_uri (reader);
-
if (em_utils_folder_is_sent (folder))
filter_source = E_FILTER_SOURCE_OUTGOING;
else if (em_utils_folder_is_outbox (folder))
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index e0ef3940c0..3cf8d1f1ef 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -912,13 +912,11 @@ action_mail_message_edit_cb (GtkAction *action,
EMailBackend *backend;
EShellBackend *shell_backend;
CamelFolder *folder;
- const gchar *folder_uri;
GPtrArray *uids;
gboolean replace;
backend = e_mail_reader_get_backend (reader);
folder = e_mail_reader_get_folder (reader);
- folder_uri = e_mail_reader_get_folder_uri (reader);
uids = e_mail_reader_get_selected_uids (reader);
shell_backend = E_SHELL_BACKEND (backend);
@@ -3772,7 +3770,6 @@ e_mail_reader_check_state (EMailReader *reader)
GPtrArray *uids;
CamelFolder *folder;
CamelStore *store = NULL;
- const gchar *folder_uri;
const gchar *tag;
gboolean can_clear_flags = FALSE;
gboolean can_flag_completed = FALSE;
@@ -3796,7 +3793,6 @@ e_mail_reader_check_state (EMailReader *reader)
g_return_val_if_fail (E_IS_MAIL_READER (reader), 0);
folder = e_mail_reader_get_folder (reader);
- folder_uri = e_mail_reader_get_folder_uri (reader);
uids = e_mail_reader_get_selected_uids (reader);
if (folder != NULL) {
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index e720fb81ed..5147b65635 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -1997,7 +1997,6 @@ emae_check_authtype (GtkWidget *w,
EMailSession *session;
EAccount *account;
GtkWidget *editor;
- const gchar *uri;
gchar *uid;
account = em_account_editor_get_modified_account (emae);
@@ -2005,8 +2004,6 @@ emae_check_authtype (GtkWidget *w,
session = em_account_editor_get_session (emae);
- /* TODO: do we need to remove the auth mechanism from the uri? */
- uri = e_account_get_string (account, emae_service_info[service->type].account_uri_key);
g_object_ref (emae);
service->check_dialog = e_alert_dialog_new_for_args (editor ? (GtkWindow *)gtk_widget_get_toplevel (editor) : (GtkWindow *)gtk_widget_get_toplevel (w),
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-16 05:43:27 +0800