2005-12-06 [paul] 1.9.100cvs69

[claws.git] / src / plugins / dillo_viewer / dillo_viewer.c

diff --git a/src/plugins/dillo_viewer/dillo_viewer.c b/src/plugins/dillo_viewer/dillo_viewer.c
index 47efcbdbd01ef7ce6fa402ea44a1bc75d2dc2c49..ca14f3608966a9fceddf0b5784d145e037c77acf 100644 (file)
--- a/src/plugins/dillo_viewer/dillo_viewer.c
+++ b/src/plugins/dillo_viewer/dillo_viewer.c
@@ -14,17 +14,24 @@
  *
  * 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
+#  include "config.h"
+#endif
+
 #include <unistd.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
-#include "common/plugin.h"
-#include "common/utils.h"
+#include "common/sylpheed.h"
+#include "common/version.h"
+#include "plugin.h"
+#include "utils.h"
 #include "mimeview.h"
 
 #include "dillo_prefs.h"
@@ -67,13 +74,13 @@ static void dillo_show_mimepart(MimeViewer *_viewer,
        debug_print("dillo_show_mimepart\n");
 
        if (viewer->filename != NULL) {
-               unlink(viewer->filename);
+               g_unlink(viewer->filename);
                g_free(viewer->filename);
        }
 
        viewer->filename = procmime_get_tmp_file_name(partinfo);
        
-       if (!(procmime_get_part(viewer->filename, infile, partinfo) < 0)) {
+       if (!(procmime_get_part(viewer->filename, partinfo) < 0)) {
                gchar *cmd;
 
                if (viewer->socket)
@@ -84,10 +91,8 @@ static void dillo_show_mimepart(MimeViewer *_viewer,
                                  viewer->socket);
                gtk_widget_realize(viewer->socket);
                gtk_widget_show(viewer->socket);
-               gtk_signal_connect(GTK_OBJECT(viewer->socket), 
-                                  "destroy", 
-                                  GTK_SIGNAL_FUNC(socket_destroy_cb),
-                                  viewer);
+               g_signal_connect(G_OBJECT(viewer->socket), "destroy", 
+                                G_CALLBACK(socket_destroy_cb), viewer);
 
                cmd = g_strdup_printf("dillo %s%s-x %d \"%s\"",
                                      (dillo_prefs.local ? "-l " : ""),
@@ -119,7 +124,7 @@ static void dillo_destroy_viewer(MimeViewer *_viewer)
        debug_print("dillo_destroy_viewer\n");
 
        gtk_widget_unref(GTK_WIDGET(viewer->widget));
-       unlink(viewer->filename);
+       g_unlink(viewer->filename);
        g_free(viewer->filename);
        g_free(viewer);
 }
@@ -146,9 +151,12 @@ static MimeViewer *dillo_viewer_create(void)
        return (MimeViewer *) viewer;
 }
 
+static gchar *content_types[] = 
+       {"text/html", NULL};
+
 static MimeViewerFactory dillo_viewer_factory =
 {
-       "text/html",
+       content_types,  
        0,
 
        dillo_viewer_create
@@ -156,6 +164,16 @@ static MimeViewerFactory dillo_viewer_factory =
 
 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 Dillo 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 Dillo plugin");
+               return -1;
+       }
+
         dillo_prefs_init();
 
        mimeview_register_viewer_factory(&dillo_viewer_factory);
@@ -172,16 +190,16 @@ void plugin_done(void)
 
 const gchar *plugin_name(void)
 {
-       return "Dillo HTML Viewer";
+       return _("Dillo HTML Viewer");
 }
 
 const gchar *plugin_desc(void)
 {
-       return "This plugin renders HTML mail using the Dillo "
-               "web browser.";
+       return _("This plugin renders HTML mail using the Dillo "
+               "web browser.");
 }
 
 const gchar *plugin_type(void)
 {
-       return "GTK";
+       return "GTK2";
 }