diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-22 06:23:14 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-22 06:23:14 +0800 |
| commit | cbaa9eb7432b11d9bd6cb38fe5ef027612720623 (patch) | |
| tree | 6a02c49c11cc58d98b9950543480eb9d554bf89a /plugins/sa-junk-plugin | |
| parent | 84c2e3735ce6e4df88142e86446f9179b6e341e4 (diff) | |
| parent | 1f65552d0dd6e8635ef0926a0f750c4f0bd34230 (diff) | |
| download | gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.tar.gz gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.tar.zst gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.zip | |
Merge branch 'master' into kill-bonobo
Conflicts:
plugins/audio-inline/org-gnome-audio-inline.eplug.xml
plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
plugins/select-one-source/org-gnome-select-one-source.eplug.xml
Diffstat (limited to 'plugins/sa-junk-plugin')
| -rw-r--r-- | plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml index 4277040fa5..3403a3b8aa 100644 --- a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml +++ b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <e-plugin-list> <e-plugin id="org.gnome.evolution.sa_junk_plugin" - type="shlib" _name="SpamAssassin junk plugin" + type="shlib" _name="SpamAssassin Junk Filter" location="@PLUGINDIR@/liborg-gnome-sa-junk-plugin@SOEXT@"> - <_description>Filters junk messages using SpamAssassin. This plugin requires SpamAssassin to be installed.</_description> + <_description>Filter junk messages using SpamAssassin.</_description> <author name="Vivek Jain" email="jvivek@novell.com"/> <hook class="org.gnome.evolution.mail.junk:1.0"> <group id="EMJunk" > |