epiphany-extensions r1816 - trunk/extensions/adblock

[xan svn gnome org]

Author: xan
Date: Sat Feb 21 11:42:49 2009
New Revision: 1816
URL: http://svn.gnome.org/viewvc/epiphany-extensions?rev=1816&view=rev

Log:
adblock: port to GtkBuilder.

This still crashes, either a bug in GtkBuilder or a bug exposed in our
code by the port. Still better than using glade, which just couldn't
work.

Modified:
   trunk/extensions/adblock/Makefile.am
   trunk/extensions/adblock/adblock-ui.c

Modified: trunk/extensions/adblock/Makefile.am
==============================================================================
--- trunk/extensions/adblock/Makefile.am	(original)
+++ trunk/extensions/adblock/Makefile.am	Sat Feb 21 11:42:49 2009
@@ -34,7 +34,10 @@
 	-export-symbols $(top_srcdir)/ephy-extension.symbols \
 	$(AM_LDFLAGS)
 
-glade_DATA = adblock.glade
+glade_in_files = adblock.glade
+%.ui: %.glade
+	$(GTK_BUILDER_CONVERT) $< $@
+glade_DATA = $(glade_in_files:.glade=.ui)
 gladedir = $(pkgdatadir)/glade
 
 patterns_DATA = adblock-patterns
@@ -54,7 +57,7 @@
 
 @EPIPHANY_EXTENSION_RULE@
 
-CLEANFILES = $(extensionini_DATA)
+CLEANFILES = $(extensionini_DATA) $(glade_DATA)
 DISTCLEANFILES = $(extensionini_DATA)
 
 EXTRA_DIST = $(patterns_DATA) $(extensionini_in_files) $(glade_DATA)

Modified: trunk/extensions/adblock/adblock-ui.c
==============================================================================
--- trunk/extensions/adblock/adblock-ui.c	(original)
+++ trunk/extensions/adblock/adblock-ui.c	Sat Feb 21 11:42:49 2009
@@ -387,7 +387,7 @@
 
 	ephy_dialog_construct (EPHY_DIALOG (edialog),
 			properties,
-			SHARE_DIR "/glade/adblock.glade",
+			SHARE_DIR "/glade/adblock.ui",
 			"adblock-ui",
 			GETTEXT_PACKAGE);