*
* 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"
-typedef struct _dilloViewer dilloViewer;
+#include "dillo_prefs.h"
+
+typedef struct _DilloViewer DilloViewer;
-struct _dilloViewer
+struct _DilloViewer
{
MimeViewer mimeviewer;
GtkWidget *widget;
GtkWidget *socket;
- gchar *filename;
+ gchar *filename;
};
static MimeViewerFactory dillo_viewer_factory;
static GtkWidget *dillo_get_widget(MimeViewer *_viewer)
{
- dilloViewer *viewer = (dilloViewer *) _viewer;
+ DilloViewer *viewer = (DilloViewer *) _viewer;
debug_print("dillo_get_widget\n");
static gboolean socket_destroy_cb(GtkObject *object, gpointer data)
{
- dilloViewer *viewer = (dilloViewer *) data;
+ DilloViewer *viewer = (DilloViewer *) data;
debug_print("Destroyed dillo socket %p\n", viewer->socket);
viewer->socket = NULL;
return FALSE;
}
-static void dillo_show_mimepart(MimeViewer *_viewer, const gchar *infile, MimeInfo *partinfo)
+static void dillo_show_mimepart(MimeViewer *_viewer,
+ const gchar *infile,
+ MimeInfo *partinfo)
{
- dilloViewer *viewer = (dilloViewer *) _viewer;
+ DilloViewer *viewer = (DilloViewer *) _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)
+ gtk_widget_destroy(viewer->socket);
viewer->socket = gtk_socket_new();
debug_print("Adding dillo socket %p", viewer->socket);
gtk_container_add(GTK_CONTAINER(viewer->widget),
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);
- cmd = g_strdup_printf("dillo -f -l -x %d \"%s\"",
- GDK_WINDOW_XWINDOW(viewer->socket->window),
- viewer->filename);
+ 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 " : ""),
+ (dillo_prefs.full ? "-f " : ""),
+ (gint) GDK_WINDOW_XWINDOW(viewer->socket->window),
+ viewer->filename);
+
execute_command_line(cmd, TRUE);
g_free(cmd);
}
static void dillo_clear_viewer(MimeViewer *_viewer)
{
- dilloViewer *viewer = (dilloViewer *) _viewer;
+ DilloViewer *viewer = (DilloViewer *) _viewer;
+
debug_print("dillo_clear_viewer\n");
debug_print("Removing dillo socket %p\n", viewer->socket);
+
if (viewer->socket) {
gtk_widget_destroy(viewer->socket);
}
-
}
static void dillo_destroy_viewer(MimeViewer *_viewer)
{
- dilloViewer *viewer = (dilloViewer *) _viewer;
+ DilloViewer *viewer = (DilloViewer *) _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);
}
-static MimeViewer *dillo_viewer_create()
+static MimeViewer *dillo_viewer_create(void)
{
- dilloViewer *viewer;
+ DilloViewer *viewer;
debug_print("dillo_viewer_create\n");
- viewer = g_new0(dilloViewer, 1);
+ viewer = g_new0(DilloViewer, 1);
viewer->mimeviewer.factory = &dillo_viewer_factory;
-
viewer->mimeviewer.get_widget = dillo_get_widget;
viewer->mimeviewer.show_mimepart = dillo_show_mimepart;
viewer->mimeviewer.clear_viewer = dillo_clear_viewer;
viewer->mimeviewer.destroy_viewer = dillo_destroy_viewer;
-
viewer->widget = gtk_event_box_new();
+
gtk_widget_show(viewer->widget);
gtk_widget_ref(viewer->widget);
return (MimeViewer *) viewer;
}
+static gchar *content_types[] =
+ {"text/html", NULL};
+
static MimeViewerFactory dillo_viewer_factory =
{
- "text/html",
+ content_types,
0,
-
- dillo_viewer_create,
+
+ dillo_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 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);
+
return 0;
}
-void plugin_done()
+void plugin_done(void)
+{
+ mimeview_unregister_viewer_factory(&dillo_viewer_factory);
+
+ dillo_prefs_done();
+}
+
+const gchar *plugin_name(void)
{
+ return _("Dillo HTML Viewer");
}
-const gchar *plugin_name()
+const gchar *plugin_desc(void)
{
- return "View HTML mail with Dillo";
+ return _("This plugin renders HTML mail using the Dillo "
+ "web browser.");
}
-const gchar *plugin_desc()
+const gchar *plugin_type(void)
{
- return "This plugin allows to render HTML mail using the Dillo "
- "web browser.";
+ return "GTK2";
}