2005-12-05 [paul] 1.9.100cvs63
authorPaul Mangan <paul@claws-mail.org>
Mon, 5 Dec 2005 11:40:51 +0000 (11:40 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 5 Dec 2005 11:40:51 +0000 (11:40 +0000)
* configure.ac
* src/plugins/Makefile.am
* src/plugins/mathml_viewer/.cvsignore
* src/plugins/mathml_viewer/Makefile.am
* src/plugins/mathml_viewer/mathml_viewer.c
remove unmaintained mathml_viewer plugin

ChangeLog
PATCHSETS
configure.ac
src/plugins/Makefile.am
src/plugins/mathml_viewer/.cvsignore [deleted file]
src/plugins/mathml_viewer/Makefile.am [deleted file]
src/plugins/mathml_viewer/mathml_viewer.c [deleted file]

index 0166f91..0647715 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-05 [paul]      1.9.100cvs63
+
+       * configure.ac
+       * src/plugins/Makefile.am
+       * src/plugins/mathml_viewer/.cvsignore
+       * src/plugins/mathml_viewer/Makefile.am
+       * src/plugins/mathml_viewer/mathml_viewer.c
+               remove unmaintained mathml_viewer plugin
+
 2005-12-05 [paul]      1.9.100cvs62
 
        * src/summaryview.c
index e3c7166..b8ef44b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.149.2.38 -r 1.149.2.39 src/inc.c;  cvs diff -u -r 1.105.2.43 -r 1.105.2.44 src/prefs_account.c;  cvs diff -u -r 1.49.2.16 -r 1.49.2.17 src/prefs_account.h;  ) > 1.9.100cvs60.patchset
 ( cvs diff -u -r 1.382.2.199 -r 1.382.2.200 src/compose.c;  cvs diff -u -r 1.105.2.44 -r 1.105.2.45 src/prefs_account.c;  cvs diff -u -r 1.59.2.26 -r 1.59.2.27 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_quote.c;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/prefs_spelling.c;  cvs diff -u -r 1.30.2.19 -r 1.30.2.20 src/prefs_toolbar.c;  cvs diff -u -r 1.395.2.149 -r 1.395.2.150 src/summaryview.c;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/gtk/gtkutils.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/gtk/quicksearch.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/plugins/dillo_viewer/dillo_prefs.c;  ) > 1.9.100cvs61.patchset
 ( cvs diff -u -r 1.395.2.150 -r 1.395.2.151 src/summaryview.c;  ) > 1.9.100cvs62.patchset
+( cvs diff -u -r 1.654.2.1092 -r 1.654.2.1093 configure.ac;  cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/plugins/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 src/plugins/mathml_viewer/.cvsignore;  cvs diff -u -r -1.2 -r -1.3 src/plugins/mathml_viewer/Makefile.am;  cvs diff -u -r -1.9.2.6 -r -1.9.2.7 src/plugins/mathml_viewer/mathml_viewer.c;  ) > 1.9.100cvs63.patchset
index 3686f00..8e31e6c 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=62
+EXTRA_VERSION=63
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -645,29 +645,6 @@ else
 fi
 AM_CONDITIONAL(BUILD_PGPINLINE_PLUGIN, test x"$ac_cv_enable_pgpinline_plugin" = xyes)
 
-dnl --- MathML Viewer ---
-AC_MSG_CHECKING([whether to build MathML-Viewer plugin])
-AC_ARG_ENABLE(mathml-viewer-plugin,
-       [  --disable-mathml-viewer-plugin    Do not build MathML-Viewer plugin],
-       [ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=yes])
-if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
-       AC_MSG_RESULT(yes)
-       PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.5, :, ac_cv_enable_mathml_viewer_plugin=no)
-
-       if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
-
-               PLUGINS="mathml-viewer $PLUGINS"
-       else
-               AC_MSG_RESULT(not found)
-               AC_MSG_WARN([*** MathML-Viewer plugin will not be built ***])
-       fi
-else
-       AC_MSG_RESULT(no)
-fi
-AC_SUBST(GTK_MATH_VIEW_CFLAGS)
-AC_SUBST(GTK_MATH_VIEW_LIBS)
-AM_CONDITIONAL(BUILD_MATHML_VIEWER_PLUGIN, test x"$ac_cv_enable_mathml_viewer_plugin" = xyes)
-
 dnl --- Dillo Viewer ---
 AC_MSG_CHECKING([whether to build Dillo plugin])
 AC_ARG_ENABLE(dillo-viewer-plugin,
@@ -789,7 +766,6 @@ src/etpan/Makefile
 src/plugins/Makefile
 src/plugins/demo/Makefile
 src/plugins/spamassassin/Makefile
-src/plugins/mathml_viewer/Makefile
 src/plugins/dillo_viewer/Makefile
 src/plugins/trayicon/Makefile
 src/plugins/trayicon/libeggtrayicon/Makefile
index c9727a8..1fb853f 100644 (file)
@@ -6,10 +6,6 @@ if BUILD_SPAMASSASSIN_PLUGIN
 spamassasssin_dir = spamassassin
 endif
 
-if BUILD_MATHML_VIEWER_PLUGIN
-mathml_viewer_dir = mathml_viewer
-endif
-
 if BUILD_DILLO_VIEWER_PLUGIN
 dillo_viewer_dir = dillo_viewer
 endif
@@ -34,7 +30,6 @@ endif
 
 SUBDIRS = $(demo_dir) \
        $(spamassasssin_dir) \
-       $(mathml_viewer_dir) \
        $(dillo_viewer_dir) \
        $(trayicon_dir) \
        $(clamav_dir) \
diff --git a/src/plugins/mathml_viewer/.cvsignore b/src/plugins/mathml_viewer/.cvsignore
deleted file mode 100644 (file)
index 9887868..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.o
-*.la
-*.lo
\ No newline at end of file
diff --git a/src/plugins/mathml_viewer/Makefile.am b/src/plugins/mathml_viewer/Makefile.am
deleted file mode 100644 (file)
index 829db3e..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-plugindir = $(pkglibdir)/plugins
-
-plugin_LTLIBRARIES = mathml_viewer.la
-
-mathml_viewer_la_SOURCES = \
-       mathml_viewer.c
-
-mathml_viewer_la_LDFLAGS = \
-       -avoid-version -module \
-       $(GTK_LIBS) \
-       $(GTK_MATH_VIEW_LIBS)
-
-INCLUDES = \
-       -I../.. \
-       -I../../common \
-       -I../../gtk
-
-AM_CPPFLAGS = \
-       $(ASPELL_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(GTK_CFLAGS) \
-       $(GTK_MATH_VIEW_CFLAGS)
diff --git a/src/plugins/mathml_viewer/mathml_viewer.c b/src/plugins/mathml_viewer/mathml_viewer.c
deleted file mode 100644 (file)
index 59ab0b0..0000000
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto and the Sylpheed-Claws Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <unistd.h>
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gtkmathview/gtkmathview.h>
-
-#include "common/sylpheed.h"
-#include "common/version.h"
-#include "plugin.h"
-#include "utils.h"
-#include "mimeview.h"
-
-typedef struct _MathMLViewer MathMLViewer;
-
-struct _MathMLViewer
-{
-       MimeViewer mimeviewer;
-       
-       GtkScrolledWindow       *scrollwin;;
-       GtkMathView             *mathview;
-       gchar                   *filename;
-};
-
-static MimeViewerFactory mathml_viewer_factory;
-
-static GtkWidget *mathml_get_widget(MimeViewer *_viewer)
-{
-       MathMLViewer *viewer = (MathMLViewer *) _viewer;
-
-       debug_print("mathml_get_widget\n");
-
-       return GTK_WIDGET(viewer->scrollwin);
-}
-
-static void mathml_show_mimepart(MimeViewer *_viewer, const gchar *infile, MimeInfo *partinfo)
-{
-       MathMLViewer *viewer = (MathMLViewer *) _viewer;
-
-       debug_print("mathml_show_mimepart\n");
-
-       if (viewer->filename != NULL) {
-               g_unlink(viewer->filename);
-               g_free(viewer->filename);
-       }
-
-       viewer->filename = procmime_get_tmp_file_name(partinfo);
-       
-       if (!(procmime_get_part(viewer->filename, partinfo) < 0)) {
-               gchar *uri;
-               
-               uri = g_strconcat("file://", viewer->filename, NULL);
-               gtk_math_view_load_uri(GTK_MATH_VIEW(viewer->mathview), uri);
-               g_free(uri);
-       }
-}
-
-static void mathml_clear_viewer(MimeViewer *_viewer)
-{
-       MathMLViewer *viewer = (MathMLViewer *) _viewer;
-
-       debug_print("mathml_clear_viewer\n");
-
-       gtk_math_view_unload(viewer->mathview);
-}
-
-static void mathml_destroy_viewer(MimeViewer *_viewer)
-{
-       MathMLViewer *viewer = (MathMLViewer *) _viewer;
-
-       debug_print("mathml_destroy_viewer\n");
-
-       gtk_widget_unref(GTK_WIDGET(viewer->scrollwin));
-       g_unlink(viewer->filename);
-       g_free(viewer->filename);
-       g_free(viewer);
-}
-
-static MimeViewer *mathml_viewer_create(void)
-{
-       MathMLViewer *viewer;
-
-       debug_print("mathml_viewer_create\n");
-       
-       viewer = g_new0(MathMLViewer, 1);
-       viewer->mimeviewer.factory = &mathml_viewer_factory;
-
-       viewer->mimeviewer.get_widget = mathml_get_widget;
-       viewer->mimeviewer.show_mimepart = mathml_show_mimepart;
-       viewer->mimeviewer.clear_viewer = mathml_clear_viewer;
-       viewer->mimeviewer.destroy_viewer = mathml_destroy_viewer;      
-
-       viewer->scrollwin = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(NULL, NULL));
-       gtk_widget_show(GTK_WIDGET(viewer->scrollwin));
-       gtk_widget_ref(GTK_WIDGET(viewer->scrollwin));
-       gtk_scrolled_window_set_policy(viewer->scrollwin, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
-       viewer->mathview = GTK_MATH_VIEW(gtk_math_view_new(NULL, NULL));
-       gtk_widget_show(GTK_WIDGET(viewer->mathview));
-       viewer->filename = NULL;
-       gtk_container_add(GTK_CONTAINER(viewer->scrollwin), GTK_WIDGET(viewer->mathview));
-
-       return (MimeViewer *) viewer;
-}
-
-static gchar *content_types[] =
-       {"text/mathml", NULL};
-
-static MimeViewerFactory mathml_viewer_factory =
-{
-       content_types,
-       0,
-       
-       mathml_viewer_create,
-};
-
-gint plugin_init(gchar **error)
-{
-       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the MathML plugin was built with");
-               return -1;
-       }
-
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
-               *error = g_strdup("Your version of Sylpheed-Claws is too old for the MathML plugin");
-               return -1;
-       }
-
-       mimeview_register_viewer_factory(&mathml_viewer_factory);
-       return 0;       
-}
-
-void plugin_done(void)
-{
-       mimeview_unregister_viewer_factory(&mathml_viewer_factory);
-}
-
-const gchar *plugin_name(void)
-{
-       return _("MathML Viewer");
-}
-
-const gchar *plugin_desc(void)
-{
-       return _("This plugin uses the GtkMathView widget to render "
-                "MathML attachments (Content-Type: text/mathml)");
-}
-
-const gchar *plugin_type(void)
-{
-       return "GTK2";
-}