aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/mail-folder-cache.c5
-rw-r--r--plugins/sa-junk-plugin/em-junk-filter.c8
-rw-r--r--widgets/table/e-tree-table-adapter.c10
3 files changed, 5 insertions, 18 deletions
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 097b9bf9b4..b6a92bc8be 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -1096,10 +1096,7 @@ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp)
gboolean
mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags)
{
- char *uri;
-
- uri = mail_tools_folder_to_url (folder);
-
+ char *uri = mail_tools_folder_to_url (folder);
struct _find_info fi = { uri, NULL, NULL };
if (stores == NULL)
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 8a15ce98ac..39efa2f5ac 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -753,10 +753,6 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target)
void
em_junk_sa_commit_reports (EPlugin *ep)
{
- /* Only meaningful if we're using sa-learn */
- if (!no_allow_tell)
- return;
-
char *sync_op = ((get_spamassassin_version () >= 3) ? "--sync": "--rebuild");
char *argv[4] = {
"sa-learn",
@@ -765,6 +761,10 @@ em_junk_sa_commit_reports (EPlugin *ep)
NULL
};
+ /* Only meaningful if we're using sa-learn */
+ if (!no_allow_tell)
+ return;
+
d(fprintf (stderr, "em_junk_sa_commit_reports\n"));
if (em_junk_sa_is_available (NULL)) {
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 10c29fbf10..416f8aa026 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -757,16 +757,6 @@ etta_proxy_no_change (ETreeModel *etm, ETreeTableAdapter *etta)
e_table_model_no_change(E_TABLE_MODEL(etta));
}
-static gboolean
-remove_all (gpointer key, gpointer value, gpointer data)
-{
- GNode *gn = (GNode *) data;
- if (data)
- g_free (gn->data);
-
- return TRUE;
-}
-
static void
etta_proxy_rebuilt (ETreeModel *etm, ETreeTableAdapter *etta)
{