aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-shell-backend.c3
-rw-r--r--modules/mail/e-mail-shell-content.c9
-rw-r--r--modules/mail/e-mail-shell-view-actions.c4
-rw-r--r--modules/mail/e-mail-shell-view.c5
-rw-r--r--modules/mail/em-account-prefs.c2
-rw-r--r--modules/mail/em-composer-prefs.c2
-rw-r--r--modules/mail/em-mailer-prefs.c3
7 files changed, 1 insertions, 27 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 0f1680d0a7..de8d4f42d9 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -474,12 +474,9 @@ mail_shell_backend_window_created_cb (EShell *shell,
static void
mail_shell_backend_constructed (GObject *object)
{
- EMailShellBackendPrivate *priv;
EShell *shell;
EShellBackend *shell_backend;
- priv = E_MAIL_SHELL_BACKEND_GET_PRIVATE (object);
-
shell_backend = E_SHELL_BACKEND (object);
shell = e_shell_backend_get_shell (shell_backend);
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 992660ccc6..5ba85b27b7 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -120,8 +120,6 @@ mail_shell_content_message_list_built_cb (EMailShellContent *mail_shell_content,
EMailShellContentPrivate *priv = mail_shell_content->priv;
EShellContent *shell_content;
EShellView *shell_view;
- GtkScrolledWindow *scrolled_window;
- GtkWidget *vscrollbar;
GKeyFile *key_file;
gchar *uid;
@@ -133,9 +131,6 @@ mail_shell_content_message_list_built_cb (EMailShellContent *mail_shell_content,
shell_view = e_shell_content_get_shell_view (shell_content);
key_file = e_shell_view_get_state_key_file (shell_view);
- scrolled_window = GTK_SCROLLED_WINDOW (priv->scrolled_window);
- vscrollbar = gtk_scrolled_window_get_vscrollbar (scrolled_window);
-
if (message_list->cursor_uid != NULL)
uid = NULL;
@@ -366,14 +361,12 @@ mail_shell_content_constructed (GObject *object)
EShellContent *shell_content;
EShellBackend *shell_backend;
EShellView *shell_view;
- EShellViewClass *shell_view_class;
EMailReader *reader;
GtkWidget *message_list;
GConfBridge *bridge;
GtkWidget *container;
GtkWidget *widget;
EWebView *web_view;
- GalViewCollection *view_collection;
const gchar *key;
priv = E_MAIL_SHELL_CONTENT_GET_PRIVATE (object);
@@ -384,9 +377,7 @@ mail_shell_content_constructed (GObject *object)
shell_content = E_SHELL_CONTENT (object);
shell_view = e_shell_content_get_shell_view (shell_content);
- shell_view_class = E_SHELL_VIEW_GET_CLASS (shell_view);
shell_backend = e_shell_view_get_shell_backend (shell_view);
- view_collection = shell_view_class->view_collection;
web_view = E_WEB_VIEW (EM_FORMAT_HTML (priv->html_display)->html);
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 94b7b7b774..ab37d31a62 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -844,13 +844,11 @@ action_search_filter_cb (GtkRadioAction *action,
EShellView *shell_view)
{
EShellContent *shell_content;
- EShellWindow *shell_window;
EMailReader *reader;
GKeyFile *key_file;
const gchar *folder_uri;
shell_content = e_shell_view_get_shell_content (shell_view);
- shell_window = e_shell_view_get_shell_window (shell_view);
key_file = e_shell_view_get_state_key_file (shell_view);
reader = E_MAIL_READER (shell_content);
@@ -880,13 +878,11 @@ action_search_scope_cb (GtkRadioAction *action,
EShellView *shell_view)
{
EShellContent *shell_content;
- EShellWindow *shell_window;
EMailReader *reader;
GKeyFile *key_file;
const gchar *folder_uri;
shell_content = e_shell_view_get_shell_content (shell_view);
- shell_window = e_shell_view_get_shell_window (shell_view);
key_file = e_shell_view_get_state_key_file (shell_view);
reader = E_MAIL_READER (shell_content);
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 65965185c4..e86a5bb6ac 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -94,7 +94,6 @@ mail_shell_view_execute_search (EShellView *shell_view)
EShellSettings *shell_settings;
EShellSearchbar *searchbar;
EActionComboBox *combo_box;
- EMFormatHTMLDisplay *html_display;
GtkWidget *message_list;
EFilterRule *rule;
EMailReader *reader;
@@ -129,7 +128,6 @@ mail_shell_view_execute_search (EShellView *shell_view)
reader = E_MAIL_READER (shell_content);
folder = e_mail_reader_get_folder (reader);
folder_uri = e_mail_reader_get_folder_uri (reader);
- html_display = e_mail_reader_get_html_display (reader);
message_list = e_mail_reader_get_message_list (reader);
if (folder_uri != NULL) {
@@ -443,7 +441,6 @@ mail_shell_view_update_actions (EShellView *shell_view)
gboolean account_is_groupwise = FALSE;
gboolean folder_allows_children;
gboolean folder_can_be_deleted;
- gboolean folder_is_junk;
gboolean folder_is_outbox;
gboolean folder_is_store;
gboolean folder_is_trash;
@@ -471,8 +468,6 @@ mail_shell_view_update_actions (EShellView *shell_view)
(state & E_MAIL_SIDEBAR_FOLDER_ALLOWS_CHILDREN);
folder_can_be_deleted =
(state & E_MAIL_SIDEBAR_FOLDER_CAN_DELETE);
- folder_is_junk =
- (state & E_MAIL_SIDEBAR_FOLDER_IS_JUNK);
folder_is_outbox =
(state & E_MAIL_SIDEBAR_FOLDER_IS_OUTBOX);
folder_is_store =
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 7a9973437e..ac58ea421d 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -136,7 +136,6 @@ account_prefs_edit_account (EAccountManager *manager)
EMAccountPrefsPrivate *priv;
EMAccountEditor *emae;
EAccountTreeView *tree_view;
- EAccountList *account_list;
EAccount *account;
gpointer parent;
@@ -147,7 +146,6 @@ account_prefs_edit_account (EAccountManager *manager)
return;
}
- account_list = e_account_manager_get_account_list (manager);
tree_view = e_account_manager_get_tree_view (manager);
account = e_account_tree_view_get_selected (tree_view);
g_return_if_fail (account != NULL);
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 96192eaa77..3d1cf2ed08 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -365,14 +365,12 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
GtkListStore *store;
GtkTreeSelection *selection;
GtkCellRenderer *renderer;
- GConfBridge *bridge;
GConfClient *client;
EMConfig *ec;
EMConfigTargetPrefs *target;
GSList *l;
gint i;
- bridge = gconf_bridge_get ();
client = mail_config_get_gconf_client ();
shell_settings = e_shell_get_shell_settings (shell);
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 26d4f3e637..f32fbbf284 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -314,7 +314,6 @@ init_junk_tree (GtkWidget *label_tree, EMMailerPrefs *prefs)
{
GtkListStore *store;
GtkCellRenderer *renderer;
- gint col;
g_return_val_if_fail (label_tree != NULL, NULL);
g_return_val_if_fail (prefs != NULL, NULL);
@@ -323,7 +322,7 @@ init_junk_tree (GtkWidget *label_tree, EMMailerPrefs *prefs)
gtk_tree_view_set_model (GTK_TREE_VIEW (label_tree), GTK_TREE_MODEL (store));
renderer = gtk_cell_renderer_text_new ();
- col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (label_tree), -1, _("Header"), renderer, "text", JH_LIST_COLUMN_NAME, NULL);
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (label_tree), -1, _("Header"), renderer, "text", JH_LIST_COLUMN_NAME, NULL);
g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
renderer = gtk_cell_renderer_text_new ();