2005-12-06 [paul] 1.9.100cvs69

[claws.git] / src / plugins / pgpmime / plugin.c

diff --git a/src/plugins/pgpmime/plugin.c b/src/plugins/pgpmime/plugin.c
index fd552d22180a87bf2fe3bf21b6daf616e78c6fa2..88f9aa7679da46a5b0f5747745cffbe47dcebb6b 100644 (file)
--- a/src/plugins/pgpmime/plugin.c
+++ b/src/plugins/pgpmime/plugin.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -22,39 +22,33 @@
 #endif
 
 #include <stddef.h>
-
-#include "intl.h"
+#include <glib.h>
+#include <glib/gi18n.h>
 
 #include "version.h"
 #include "common/sylpheed.h"
-#include "sgpgme.h"
 #include "pgpmime.h"
-#include "prefs_gpg.h"
 
 gint plugin_init(gchar **error)
 {
        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
+               *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the PGP/MIME plugin was built with");
                return -1;
        }
 
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 12, 164))) {
-               *error = g_strdup("Your sylpheed version is too old");
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(1, 9, 12, 40))) {
+               *error = g_strdup("Your version of Sylpheed-Claws is too old for the PGP/MIME plugin");
                return -1;
        }
 
-       sgpgme_init();
        pgpmime_init();
-       prefs_gpg_init();
 
        return 0;       
 }
 
 void plugin_done(void)
 {
-       prefs_gpg_done();
        pgpmime_done();
-       sgpgme_done();
 }
 
 const gchar *plugin_name(void)