aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/e-mail-message-pane.c4
-rw-r--r--mail/e-mail-migrate.c4
-rw-r--r--mail/e-mail-notebook-view.c7
-rw-r--r--mail/e-mail-reader.c23
-rw-r--r--mail/e-mail-session.c3
-rw-r--r--mail/em-account-editor.c5
-rw-r--r--mail/em-format-html.c4
-rw-r--r--mail/mail-mt.c7
-rw-r--r--mail/mail-vfolder.c5
9 files changed, 4 insertions, 58 deletions
diff --git a/mail/e-mail-message-pane.c b/mail/e-mail-message-pane.c
index 1c1ccf2c12..0b5b99a60e 100644
--- a/mail/e-mail-message-pane.c
+++ b/mail/e-mail-message-pane.c
@@ -41,10 +41,6 @@ G_DEFINE_TYPE (EMailMessagePane, e_mail_message_pane, E_TYPE_MAIL_PANED_VIEW)
static void
mail_message_pane_constructed (GObject *object)
{
- EMailMessagePanePrivate *priv;
-
- priv = E_MAIL_MESSAGE_PANE_GET_PRIVATE (object);
-
/* Chain up to parent's constructed() method. */
G_OBJECT_CLASS (e_mail_message_pane_parent_class)->constructed (object);
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 984cf3558c..9ec894a4b9 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -943,7 +943,6 @@ exit:
static gboolean
create_mbox_account (EShellBackend *shell_backend, EMMigrateSession *session)
{
- CamelService *mbox_service;
EMailBackend *mail_backend;
EMailSession *mail_session;
CamelURL *url;
@@ -968,9 +967,6 @@ create_mbox_account (EShellBackend *shell_backend, EMMigrateSession *session)
g_free (temp);
uri = camel_url_to_string (url, 0);
- mbox_service = camel_session_get_service (
- CAMEL_SESSION (session), uri,
- CAMEL_PROVIDER_STORE, NULL);
e_account_set_string (account, E_ACCOUNT_SOURCE_URL, uri);
#ifndef G_OS_WIN32
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c
index 4a7e7d9bf5..e4d3c1ec32 100644
--- a/mail/e-mail-notebook-view.c
+++ b/mail/e-mail-notebook-view.c
@@ -898,7 +898,6 @@ mail_netbook_view_open_mail (EMailView *view,
EMailView *pane;
gint page;
CamelMessageInfo *info;
- GtkWidget *preview;
gint pos;
#if HAVE_CLUTTER
@@ -925,8 +924,6 @@ mail_netbook_view_open_mail (EMailView *view,
gtk_widget_show (GTK_WIDGET (pane));
- preview = e_mail_paned_view_get_preview (E_MAIL_PANED_VIEW (pane));
-
folder = e_mail_reader_get_folder (E_MAIL_READER (view));
folder_uri = e_mail_reader_get_folder_uri (E_MAIL_READER (view));
@@ -1131,7 +1128,9 @@ mail_notebook_view_set_folder (EMailReader *reader,
if (folder || folder_uri) {
gint page;
+#if HAVE_CLUTTER
GtkWidget *list;
+#endif
if (priv->inited) {
EMailView *old_view = priv->current_view;
@@ -1216,8 +1215,8 @@ mail_notebook_view_set_folder (EMailReader *reader,
#endif
}
- list = e_mail_reader_get_message_list (E_MAIL_READER (priv->current_view));
#if HAVE_CLUTTER
+ list = e_mail_reader_get_message_list (E_MAIL_READER (priv->current_view));
g_signal_connect (tab , "closed",
G_CALLBACK (mnv_tab_closed), reader);
g_object_set_data ((GObject *)priv->current_view, "stage", priv->stage);
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index c05b392cda..b9948ae240 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -630,8 +630,6 @@ check_close_browser_reader (EMailReader *reader)
gchar *value;
gboolean close_it = FALSE;
- g_return_if_fail (read != NULL);
-
/* only allow closing of a mail browser and nothing else */
if (!E_IS_MAIL_BROWSER (reader))
return;
@@ -2715,7 +2713,6 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader)
GtkWidget *message_list;
EWebView *web_view;
CamelFolder *folder;
- CamelStore *parent_store;
EMailBackend *backend;
const gchar *cursor_uid;
const gchar *format_uid;
@@ -2723,7 +2720,6 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader)
priv = E_MAIL_READER_GET_PRIVATE (reader);
folder = e_mail_reader_get_folder (reader);
- parent_store = camel_folder_get_parent_store (folder);
backend = e_mail_reader_get_backend (reader);
formatter = e_mail_reader_get_formatter (reader);
@@ -2804,14 +2800,9 @@ mail_reader_message_selected_cb (EMailReader *reader,
{
EMailReaderPrivate *priv;
MessageList *message_list;
- CamelFolder *folder;
- CamelStore *parent_store;
priv = E_MAIL_READER_GET_PRIVATE (reader);
- folder = e_mail_reader_get_folder (reader);
- parent_store = camel_folder_get_parent_store (folder);
-
/* Cancel the previous message retrieval activity. */
g_cancellable_cancel (priv->retrieving_message);
@@ -2954,7 +2945,6 @@ mail_reader_update_actions (EMailReader *reader,
GtkAction *action;
const gchar *action_name;
gboolean sensitive;
- EMailReaderPrivate *priv;
/* Be descriptive. */
gboolean any_messages_selected;
@@ -2978,8 +2968,6 @@ mail_reader_update_actions (EMailReader *reader,
gboolean first_message_selected = FALSE;
gboolean last_message_selected = FALSE;
- priv = E_MAIL_READER_GET_PRIVATE (reader);
-
backend = e_mail_reader_get_backend (reader);
shell_backend = E_SHELL_BACKEND (backend);
@@ -3516,10 +3504,6 @@ e_mail_reader_init (EMailReader *reader,
gboolean init_actions,
gboolean connect_signals)
{
- EShell *shell;
- EMailBackend *backend;
- EShellBackend *shell_backend;
- EShellSettings *shell_settings;
EMFormatHTML *formatter;
EMenuToolAction *menu_tool_action;
EWebView *web_view;
@@ -3533,14 +3517,9 @@ e_mail_reader_init (EMailReader *reader,
g_return_if_fail (E_IS_MAIL_READER (reader));
- backend = e_mail_reader_get_backend (reader);
formatter = e_mail_reader_get_formatter (reader);
message_list = e_mail_reader_get_message_list (reader);
- shell_backend = E_SHELL_BACKEND (backend);
- shell = e_shell_backend_get_shell (shell_backend);
- shell_settings = e_shell_get_shell_settings (shell);
-
web_view = em_format_html_get_web_view (formatter);
if (!init_actions)
@@ -4288,7 +4267,6 @@ e_mail_reader_show_search_bar (EMailReader *reader)
void
e_mail_reader_enable_show_folder (EMailReader *reader)
{
- EMailReaderPrivate *priv;
CamelFolder *folder;
GtkAction *action;
const gchar *action_name;
@@ -4298,7 +4276,6 @@ e_mail_reader_enable_show_folder (EMailReader *reader)
g_return_if_fail (E_IS_MAIL_READER (reader));
- priv = E_MAIL_READER_GET_PRIVATE (reader);
folder = e_mail_reader_get_folder (reader);
full_name = camel_folder_get_full_name (folder);
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 7c9a8e041a..a9b12b02ce 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -450,9 +450,6 @@ proxy_gconf_notify_cb (GConfClient* client,
gpointer user_data)
{
CamelSession *session = CAMEL_SESSION (user_data);
- const gchar *key;
-
- key = gconf_entry_get_key (entry);
if (strcmp (entry->key, KEY_SOCKS_HOST) == 0
|| strcmp (entry->key, KEY_SOCKS_PORT) == 0)
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 0a74e6b3b8..747fd664da 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -799,14 +799,9 @@ emae_signaturetype_changed (GtkComboBox *dropdown, EMAccountEditor *emae)
static void
emae_signature_new (GtkWidget *widget, EMAccountEditor *emae)
{
- EShell *shell;
- EShellSettings *shell_settings;
GtkWidget *editor;
gpointer parent;
- shell = e_shell_get_default ();
- shell_settings = e_shell_get_shell_settings (shell);
-
parent = gtk_widget_get_toplevel (widget);
parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index f32124d321..fb7ad59568 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -2175,8 +2175,6 @@ efh_multipart_related (EMFormat *emf,
CamelContentType *content_type;
const gchar *start;
gint i, nparts, partidlen, displayid = 0;
- /* puri is set but never used */
- EMFormatPURI *puri;
struct _EMFormatHTMLJob *job;
if (!CAMEL_IS_MULTIPART (mp)) {
@@ -2225,7 +2223,7 @@ efh_multipart_related (EMFormat *emf,
body_part = camel_multipart_get_part (mp, i);
if (body_part != display_part) {
g_string_append_printf(emf->part_id, "related.%d", i);
- puri = em_format_add_puri (emf, sizeof (EMFormatPURI), NULL, body_part, emfh_write_related);
+ em_format_add_puri (emf, sizeof (EMFormatPURI), NULL, body_part, emfh_write_related);
g_string_truncate (emf->part_id, partidlen);
d(printf(" part '%s' '%s' added\n", puri->uri?puri->uri:"", puri->cid));
}
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 21471c5108..a65f6e3c9e 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -131,15 +131,8 @@ checkmem (gpointer p)
static gboolean
mail_msg_free (MailMsg *mail_msg)
{
- EShell *shell;
- EShellBackend *shell_backend;
-
/* This is an idle callback. */
- shell = e_shell_get_default ();
- shell_backend = e_shell_get_backend_by_name (
- shell, shell_builtin_backend);
-
if (mail_msg->activity != NULL)
g_object_unref (mail_msg->activity);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 9c8b87506f..5c349e20d7 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -1218,7 +1218,6 @@ vfolder_edit (EShellView *shell_view)
EShellBackend *shell_backend;
EShellWindow *shell_window;
EMailBackend *backend;
- EMailSession *session;
GtkWidget *dialog;
const gchar *config_dir;
gchar *filename;
@@ -1232,7 +1231,6 @@ vfolder_edit (EShellView *shell_view)
filename = g_build_filename (config_dir, "vfolders.xml", NULL);
backend = E_MAIL_BACKEND (shell_backend);
- session = e_mail_backend_get_session (backend);
vfolder_load_storage (backend);
@@ -1400,13 +1398,10 @@ vfolder_clone_rule (EMailSession *session, EFilterRule *in)
void
vfolder_gui_add_rule (EMVFolderRule *rule)
{
- EMailSession *session;
GtkWidget *w;
GtkDialog *gd;
GtkWidget *container;
- session = em_vfolder_rule_get_session (rule);
-
w = e_filter_rule_get_widget ((EFilterRule *)rule, (ERuleContext *)context);
gd = (GtkDialog *)gtk_dialog_new_with_buttons (
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 01:27:38 +0800