GNOME.org
 

[evolution/webkit: 174/196] Make most plugins GtkHTML-free (except for those interacting with the composer)

commit 23e1b2217eadff5ce70c0a069f01dcbe8c88403c
Author: Dan VrÃtil <dvratil redhat com>
Date:   Fri Feb 24 14:34:27 2012 +0100

    Make most plugins GtkHTML-free (except for those interacting with the composer)

 plugins/audio-inline/Makefile.am        |    6 ++----
 plugins/audio-inline/audio-inline.c     |   20 +++++++++-----------
 plugins/dbx-import/Makefile.am          |    6 ++----
 plugins/itip-formatter/Makefile.am      |    6 ++----
 plugins/itip-formatter/itip-formatter.c |    1 -
 plugins/itip-formatter/itip-view.c      |    1 -
 plugins/mail-to-task/Makefile.am        |    6 ++----
 plugins/mail-to-task/mail-to-task.c     |    1 -
 plugins/mark-all-read/Makefile.am       |    6 ++----
 plugins/pst-import/Makefile.am          |    2 --
 plugins/tnef-attachments/Makefile.am    |    2 --
 plugins/vcard-inline/Makefile.am        |    6 ++----
 12 files changed, 21 insertions(+), 42 deletions(-)
---
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index fc204f9..7afdcee 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -17,8 +17,7 @@ liborg_gnome_audio_inline_la_CPPFLAGS =			\
 	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GSTREAMER_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GSTREAMER_CFLAGS)
 
 liborg_gnome_audio_inline_la_SOURCES = audio-inline.c
 
@@ -30,8 +29,7 @@ liborg_gnome_audio_inline_la_LIBADD =			\
 	$(top_builddir)/em-format/libemformat.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
-	$(GSTREAMER_LIBS)				\
-	$(GTKHTML_LIBS)
+	$(GSTREAMER_LIBS)
 
 EXTRA_DIST = org-gnome-audio-inline.eplug.xml
 
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index efb1cc6..788a365 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -29,7 +29,6 @@
 #include "e-util/e-mktemp.h"
 #include "mail/em-format-hook.h"
 #include "mail/em-format-html.h"
-#include "gtkhtml/gtkhtml-embedded.h"
 #include "gst/gst.h"
 
 #define d(x)
@@ -45,8 +44,6 @@ e_plugin_lib_enable (EPlugin *ep,
 
 void org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t);
 
-static volatile gint org_gnome_audio_class_id_counter = 0;
-
 typedef struct _EMFormatInlineAudioPURI EMFormatInlineAudioPURI;
 
 struct _EMFormatInlineAudioPURI {
@@ -321,21 +318,20 @@ org_gnome_audio_inline_format (gpointer ep,
                                EMFormatHookTarget *t)
 {
 	EMFormatInlineAudioPURI *pobj;
-	gchar *classid;
-
-	classid = g_strdup_printf (
-		"org-gnome-audio-inline-button-panel-%d",
-		org_gnome_audio_class_id_counter);
+	gint len;
 
-	org_gnome_audio_class_id_counter++;
+	len = t->part_id->len;
+	g_string_append (t->part_id, ".org-gnome-audio-inline-button-panel");
 
-	d(printf ("audio inline formatter: format classid %s\n", classid));
+	d(printf ("audio inline formatter: format classid %s\n", t->part_id->str));
 
 	pobj = (EMFormatInlineAudioPURI *) em_format_puri_new (
-                        t->format, sizeof (EMFormatInlineAudioPURI), t->part, classid);
+                        t->format, sizeof (EMFormatInlineAudioPURI),
+			t->part, t->part_id->str);
 	pobj->puri.widget_func = org_gnome_audio_inline_button_panel;
 	pobj->puri.write_func = write_button_panel;
 	pobj->puri.part = g_object_ref (t->part);
+	pobj->puri.is_attachment = TRUE;
 	pobj->filename = NULL;
 	pobj->playbin = NULL;
 	pobj->play_button = NULL;
@@ -346,4 +342,6 @@ org_gnome_audio_inline_format (gpointer ep,
 	pobj->target_state = GST_STATE_NULL;
 
         em_format_add_puri (t->format, (EMFormatPURI *) pobj);
+
+	g_string_truncate (t->part_id, len);
 }
diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am
index eeaf69f..5bead7d 100644
--- a/plugins/dbx-import/Makefile.am
+++ b/plugins/dbx-import/Makefile.am
@@ -16,8 +16,7 @@ liborg_gnome_dbx_import_la_CPPFLAGS =			\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_dbx_import_la_SOURCES = dbx-importer.c
 
@@ -30,8 +29,7 @@ liborg_gnome_dbx_import_la_LIBADD =			\
 	$(top_builddir)/libemail-engine/libemail-engine.la \
 	$(top_builddir)/libemail-utils/libemail-utils.la  \
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
-	$(GNOME_PLATFORM_LIBS)				\
-	$(GTKHTML_LIBS)
+	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-dbx-import.eplug.xml
 
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am
index 381f99e..98c74d6 100644
--- a/plugins/itip-formatter/Makefile.am
+++ b/plugins/itip-formatter/Makefile.am
@@ -8,8 +8,7 @@ liborg_gnome_itip_formatter_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h
 
@@ -26,8 +25,7 @@ liborg_gnome_itip_formatter_la_LIBADD =				\
 	$(top_builddir)/libemail-engine/libemail-engine.la	\
 	$(top_builddir)/libevolution-utils/libevolution-utils.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(GTKHTML_LIBS)
+	$(GNOME_PLATFORM_LIBS)
 
 error_DATA = org-gnome-itip-formatter.error
 errordir = $(privdatadir)/errors
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 40bcf51..40582f1 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -33,7 +33,6 @@
 #include <libedataserver/e-account-list.h>
 #include <libedataserverui/e-source-selector.h>
 #include <libedataserverui/e-client-utils.h>
-#include <gtkhtml/gtkhtml-embedded.h>
 
 #include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-mktemp.h>
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 2732384..35b08b2 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -31,7 +31,6 @@
 #include <libedataserverui/e-source-combo-box.h>
 #include <libecal/e-cal-client.h>
 #include <libecal/e-cal-time-util.h>
-#include <gtkhtml/gtkhtml-embedded.h>
 #include <mail/em-format-hook.h>
 #include <mail/em-format-html.h>
 #include <libedataserver/e-account-list.h>
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index 66f6ff5..da78753 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -9,8 +9,7 @@ liborg_gnome_mail_to_task_la_CPPFLAGS =			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c
 
@@ -26,8 +25,7 @@ liborg_gnome_mail_to_task_la_LIBADD =	\
 	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(top_builddir)/libemail-engine/libemail-engine.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)						\
-	$(GTKHTML_LIBS)
+	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-mail-to-task.eplug.xml
 
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index f6d94b8..09ec15d 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <gtkhtml/gtkhtml.h>
 #include <libecal/e-cal-client.h>
 #include <libecal/e-cal-component.h>
 #include <libedataserver/e-account.h>
diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index 739601c..4740bff 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -9,8 +9,7 @@ liborg_gnome_mark_all_read_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c  
 
@@ -22,8 +21,7 @@ liborg_gnome_mark_all_read_la_LIBADD = 			\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/libevolution-utils/libevolution-utils.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
-	$(GNOME_PLATFORM_LIBS)				\
-	$(GTKHTML_LIBS)
+	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-mark-all-read.eplug.xml
 
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 5aeb114..b81e0d2 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -18,7 +18,6 @@ liborg_gnome_pst_import_la_CPPFLAGS =			\
 	-I$(top_builddir)				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)				\
 	$(LIBPST_CFLAGS)
 
 liborg_gnome_pst_import_la_SOURCES = pst-importer.c
@@ -34,7 +33,6 @@ liborg_gnome_pst_import_la_LIBADD =				\
 	$(top_builddir)/libevolution-utils/libevolution-utils.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
-	$(GTKHTML_LIBS)						\
 	$(LIBPST_LIBS)
 
 EXTRA_DIST = org-gnome-pst-import.eplug.xml
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 250453d..6a39304 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -16,7 +16,6 @@ liborg_gnome_tnef_attachments_la_CPPFLAGS =		\
 	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)				\
 	$(TNEF_CFLAGS)
 
 liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c
@@ -28,7 +27,6 @@ liborg_gnome_tnef_attachments_la_LIBADD = 		\
 	$(top_builddir)/em-format/libemformat.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
-	$(GTKHTML_LIBS)					\
 	-lytnef
 
 EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index edc612e..afde012 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -16,8 +16,7 @@ liborg_gnome_vcard_inline_la_CPPFLAGS = \
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
 
@@ -31,8 +30,7 @@ liborg_gnome_vcard_inline_la_LIBADD =					\
 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
 	$(top_builddir)/em-format/libemformat.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)						\
-	$(GTKHTML_LIBS)
+	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-vcard-inline.eplug.xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]