aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/bogo-junk-plugin/ChangeLog7
-rw-r--r--plugins/bogo-junk-plugin/Makefile.am1
-rw-r--r--plugins/bogo-junk-plugin/bf-junk-filter.c47
-rw-r--r--plugins/email-custom-header/ChangeLog11
-rw-r--r--plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in1
-rw-r--r--plugins/email-custom-header/email-custom-header.c2
-rw-r--r--plugins/groupwise-features/ChangeLog7
-rw-r--r--plugins/groupwise-features/mail-retract.c4
-rw-r--r--plugins/mailing-list-actions/ChangeLog5
-rw-r--r--plugins/mailing-list-actions/mailing-list-actions.c1
-rw-r--r--plugins/publish-calendar/ChangeLog7
-rw-r--r--plugins/publish-calendar/url-editor-dialog.c6
12 files changed, 95 insertions, 4 deletions
diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog
index b14a280332..e4007d4525 100644
--- a/plugins/bogo-junk-plugin/ChangeLog
+++ b/plugins/bogo-junk-plugin/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-15 srinivasa ragavan <sragavan@novell.com>
+
+ * makefile.am:
+ * bf-junk-filter.c: (init_db), (pipe_to_bogofilter): init the
+ bogofilter if it wasn't. say that evolution's welcome message is not
+ junk.
+
2008-10-14 Sankar P <psankar@novell.com>
License Changes
diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am
index cc89c0072e..886d60392d 100644
--- a/plugins/bogo-junk-plugin/Makefile.am
+++ b/plugins/bogo-junk-plugin/Makefile.am
@@ -1,5 +1,6 @@
INCLUDES = \
-I$(top_srcdir) \
+ -DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \
$(EVOLUTION_MAIL_CFLAGS)
@EVO_PLUGIN_RULE@
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 1e5fbbc656..aca10643e8 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -40,6 +40,8 @@
#include "mail/em-config.h"
#include <mail/em-junk-hook.h>
#include <camel/camel-data-wrapper.h>
+#include <camel/camel-mime-message.h>
+#include <camel/camel-mime-parser.h>
#include <camel/camel-stream-fs.h>
#include <camel/camel-debug.h>
#include <gconf/gconf-client.h>
@@ -69,6 +71,7 @@ void *em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target);
+static gint pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error);
/* eplugin stuff */
int e_plugin_lib_enable (EPluginLib *ep, int enable);
@@ -78,6 +81,37 @@ int e_plugin_lib_enable (EPluginLib *ep, int enable);
static gboolean em_junk_bf_unicode = TRUE;
+static void
+init_db ()
+{
+ CamelStream *stream = camel_stream_fs_new_with_name (WELCOME_MESSAGE, O_RDONLY, 0);
+ CamelMimeParser *parser = camel_mime_parser_new ();
+ CamelMimeMessage *msg = camel_mime_message_new ();
+ gchar *argv[] = {
+ em_junk_bf_binary,
+ "-n",
+ NULL,
+ NULL
+ };
+
+ camel_mime_parser_init_with_stream (parser, stream);
+ camel_mime_parser_scan_from (parser, FALSE);
+ camel_object_unref (stream);
+
+ camel_mime_part_construct_from_parser ((CamelMimePart *) msg, parser);
+ camel_object_unref (parser);
+
+ d(fprintf (stderr, "Initing the bogofilter DB with Welcome message\n"));
+
+ if (em_junk_bf_unicode) {
+ argv[2] = "--unicode=yes";
+ }
+
+ pipe_to_bogofilter (msg, argv, NULL);
+ camel_object_unref (msg);
+
+}
+
static gint
pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error)
{
@@ -88,7 +122,9 @@ pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error)
gint status;
gint waitres;
gint res;
+ static gboolean only_once = FALSE;
+retry:
if (camel_debug_start ("junk")) {
int i;
@@ -153,8 +189,17 @@ pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error)
res = BOGOFILTER_ERROR;
}
- if (res < 0 || res > 2)
+ if (res < 0 || res > 2) {
+ if (!only_once) {
+ /* Create wordlist.db */
+ only_once = TRUE;
+ init_db();
+
+ goto retry;
+ }
g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to Bogofilter failed, error code: %d."), res);
+
+ }
return res;
}
diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog
index 44bf5cb76b..20b2a9b3a4 100644
--- a/plugins/email-custom-header/ChangeLog
+++ b/plugins/email-custom-header/ChangeLog
@@ -1,3 +1,14 @@
+2009-01-09 Takao Fujiwara <takao.fujiwara@sun.com>
+
+ Reviewed by Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fix for bug #567129
+
+ * apps_evolution_email_custom_header.schemas.in:
+ Add <default> tag in C locale to localize the value.
+ * email-custom-header.c (epech_setup_widgets):
+ Add gettext.
+
2008-09-12 Sankar P <psankar@novell.com>
License Changes
diff --git a/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in b/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
index cb3bd97ce8..1648026d54 100644
--- a/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
+++ b/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
@@ -8,6 +8,7 @@
<list_type>string</list_type>
<default>[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]</default>
<locale name="C">
+ <default><!-- Translators: '=' and ';' should not be changed but ASCII -->[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]</default>
<short>List of Custom Headers</short>
<long>The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by "=" and the values separated by ";"</long>
</locale>
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index b3feb99de2..5942d28c20 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -367,7 +367,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
(temp_header_value_ptr->sub_header_string_value)->str);
}
- gtk_combo_box_append_text (GTK_COMBO_BOX (sub_combo_box_ptr->header_value_combo_box),"None");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (sub_combo_box_ptr->header_value_combo_box), _("None"));
gtk_widget_show (sub_combo_box_ptr->header_value_combo_box);
}
}
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 1fb67ff518..aeb89aecb5 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-29 Bharath Acharya <abharath@novell.com>
+
+ ** Fix for bug bnc #435694
+
+ * mail-retract.c: (org_gnome_retract_message): Since we now add a bar,
+ lets set the popup items right.
+
2008-11-20 Bharath Acharya <abharath@novell.com>
** Fix for bug bnc #446286
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 737d6626cd..928a780124 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -104,8 +104,8 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t)
/* for translation*/
if (!first) {
- popup_items[0].label = _(popup_items[0].label);
- popup_items[0].user_data = g_strdup((char *) g_ptr_array_index(uids, 0));
+ popup_items[1].label = _(popup_items[1].label);
+ popup_items[1].user_data = g_strdup((char *) g_ptr_array_index(uids, 0));
}
first++;
diff --git a/plugins/mailing-list-actions/ChangeLog b/plugins/mailing-list-actions/ChangeLog
index f53e9e3961..4c665ed4b6 100644
--- a/plugins/mailing-list-actions/ChangeLog
+++ b/plugins/mailing-list-actions/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-11 Matthew Barnes <mbarnes@redhat.com>
+
+ * mailing-list-actions.c (emla_list_action_do):
+ Call e_show_uri() instead of gnome_url_show().
+
2008-12-08 Jennifer Newman <jennifer.newman@tufts.edu>
** Fix for bug #549964
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index 7d586c32c7..9dd5c1c57e 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -43,6 +43,7 @@
#include "mail/mail-ops.h"
#include "mail/mail-mt.h"
#include "mail/mail-config.h"
+#include "e-util/e-util.h"
#include "e-util/e-error.h"
typedef enum {
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog
index fa6c292d11..ad18f9331a 100644
--- a/plugins/publish-calendar/ChangeLog
+++ b/plugins/publish-calendar/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-16 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #359010
+
+ * url-editor-dialog.c: (url_editor_dialog_new):
+ Set title of the window based on the parameter/action.
+
2008-10-03 Sankar P <psankar@novell.com>
License Changes
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index abcd1ede38..8e1c735dc3 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -24,6 +24,7 @@
#include <libedataserverui/e-passwords.h>
#include <libedataserver/e-url.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <string.h>
#include <e-util/e-util-private.h>
@@ -456,6 +457,11 @@ url_editor_dialog_new (GtkTreeModel *url_list_model, EPublishUri *uri)
dialog->url_list_model = g_object_ref (url_list_model);
dialog->uri = uri;
+ if (!uri)
+ gtk_window_set_title (GTK_WINDOW (dialog), _("New Location"));
+ else
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Location"));
+
if (url_editor_dialog_construct (dialog))
return GTK_WIDGET (dialog);
generated by cgit (git 2.34.1) at 2024-11-17 15:57:40 +0800