[epiphany-extensions/peas: 12/15] adblock: port to libpeas

[Diego Escalante Urrelo <diegoe src gnome org>]

commit a5539ad14cd5b1899b6ca2a4aefd9a7a8a8c55fd
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Thu Apr 7 11:53:28 2011 -0500

    adblock: port to libpeas

 extensions/adblock/Makefile.am                  |   11 ++---
 extensions/adblock/adblock.ephy-extension.in.in |   11 -----
 extensions/adblock/adblock.plugin.in.in         |    7 +++
 extensions/adblock/ephy-adblock-extension.c     |   13 ++++++
 extensions/adblock/ephy-adblock-extension.h     |    2 +
 extensions/adblock/extension.c                  |   49 -----------------------
 6 files changed, 27 insertions(+), 66 deletions(-)
---
diff --git a/extensions/adblock/Makefile.am b/extensions/adblock/Makefile.am
index 4c082c6..0319592 100644
--- a/extensions/adblock/Makefile.am
+++ b/extensions/adblock/Makefile.am
@@ -11,8 +11,7 @@ libadblockextension_la_SOURCES = \
 	ad-uri-tester.h			\
 	ad-uri-tester.c			\
 	adblock-ui.h			\
-	adblock-ui.c			\
-	extension.c
+	adblock-ui.c
 
 libadblockextension_la_CPPFLAGS = \
         -I$(top_srcdir)/include				\
@@ -27,7 +26,7 @@ libadblockextension_la_CFLAGS = \
 
 libadblockextension_la_LDFLAGS = \
 	-module -avoid-version \
-	-export-symbols $(top_srcdir)/ephy-extension.symbols \
+	-no-undefined \
 	$(AM_LDFLAGS)
 
 uidir = $(pkgdatadir)/ui
@@ -40,10 +39,10 @@ update-adblock-patterns: download-latest.pl
 	perl $< > $(patterns_DATA)
 
 extensioninidir = $(extensiondir)
-extensionini_in_files = adblock.ephy-extension.in.in
-extensionini_DATA = $(extensionini_in_files:.ephy-extension.in.in=.ephy-extension)
+extensionini_in_files = adblock.plugin.in.in
+extensionini_DATA = $(extensionini_in_files:.plugin.in.in=.plugin)
 
-%.ephy-extension.in: %.ephy-extension.in.in $(extension_LTLIBRARIES)
+%.plugin.in: %.plugin.in.in $(extension_LTLIBRARIES)
 	$(AM_V_GEN) \
 	sed -e "s|%LIBRARY%|`. ./$(extension_LTLIBRARIES) && echo $$dlname`|" \
 	    -e "s|%EXTENSION_DIR%|$(extensiondir)|" \
diff --git a/extensions/adblock/adblock.plugin.in.in b/extensions/adblock/adblock.plugin.in.in
new file mode 100644
index 0000000..2acbf2f
--- /dev/null
+++ b/extensions/adblock/adblock.plugin.in.in
@@ -0,0 +1,7 @@
+[Plugin]
+Module=%LIBRARY%
+_Name=Ad Blocker
+_Description=Block the pest!
+Authors=Adam Hooper <adamh cvs gnome org>
+IAge=1
+Website=http://www.gnome.org/projects/epiphany/extensions.html
diff --git a/extensions/adblock/ephy-adblock-extension.c b/extensions/adblock/ephy-adblock-extension.c
index e8bb151..de07750 100644
--- a/extensions/adblock/ephy-adblock-extension.c
+++ b/extensions/adblock/ephy-adblock-extension.c
@@ -613,3 +613,16 @@ ephy_adblock_extension_class_init (EphyAdblockExtensionClass *klass)
 
 	g_type_class_add_private (object_class, sizeof (EphyAdblockExtensionPrivate));
 }
+
+G_MODULE_EXPORT void
+peas_register_types (PeasObjectModule *module)
+{
+	ad_blocker_register_type (G_TYPE_MODULE (module));
+	ad_uri_tester_register_type (G_TYPE_MODULE (module));
+	adblock_ui_register_type (G_TYPE_MODULE (module));
+	ephy_adblock_extension_register_type (G_TYPE_MODULE (module));
+
+	peas_object_module_register_extension_type (module,
+						    EPHY_TYPE_EXTENSION,
+						    EPHY_TYPE_ADBLOCK_EXTENSION);
+}
diff --git a/extensions/adblock/ephy-adblock-extension.h b/extensions/adblock/ephy-adblock-extension.h
index ec64ece..06e1602 100644
--- a/extensions/adblock/ephy-adblock-extension.h
+++ b/extensions/adblock/ephy-adblock-extension.h
@@ -60,6 +60,8 @@ GType	ephy_adblock_extension_get_type		(void);
 
 GType	ephy_adblock_extension_register_type	(GTypeModule *module);
 
+G_MODULE_EXPORT void peas_register_types 	(PeasObjectModule *module);
+
 G_END_DECLS
 
 #endif