epiphany-extensions r1805 - in trunk: . extensions/extensions-manager-ui

[xan svn gnome org]

Author: xan
Date: Tue Feb 10 10:15:50 2009
New Revision: 1805
URL: http://svn.gnome.org/viewvc/epiphany-extensions?rev=1805&view=rev

Log:
Port extensions-manager-ui to GtkBuilder.

Other extensions still need to be ported.

Modified:
   trunk/configure.ac
   trunk/extensions/extensions-manager-ui/Makefile.am
   trunk/extensions/extensions-manager-ui/extensions-manager-ui.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Feb 10 10:15:50 2009
@@ -346,6 +346,15 @@
 AC_SUBST([SVN_MODULE],[epiphany-extensions])
 AC_SUBST([SVN_BRANCH],[e_e_branch])
 
+# **************************
+# gtk-builder-convert binary
+# **************************
+
+AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false])
+if test "$GTK_BUILDER_CONVERT" = "false"; then
+  AC_MSG_ERROR([gtk-builder-convert not found])
+fi
+
 # *******************************
 # *******************************
 

Modified: trunk/extensions/extensions-manager-ui/Makefile.am
==============================================================================
--- trunk/extensions/extensions-manager-ui/Makefile.am	(original)
+++ trunk/extensions/extensions-manager-ui/Makefile.am	Tue Feb 10 10:15:50 2009
@@ -24,7 +24,12 @@
 	$(AM_LDFLAGS)
 
 gladedir = $(pkgdatadir)/glade
-glade_DATA = extensions-manager-ui.glade
+glade_in_files = extensions-manager-ui.glade
+
+%.ui: %.glade
+	$(GTK_BUILDER_CONVERT) $< $@
+
+glade_DATA = $(glade_in_files:.glade=.ui)
 
 extensioninidir = $(extensiondir)
 extensionini_in_files = extensions-manager-ui.ephy-extension.in.in
@@ -37,7 +42,7 @@
 
 @EPIPHANY_EXTENSION_RULE@
 
-CLEANFILES = $(extensionini_DATA)
+CLEANFILES = $(extensionini_DATA) $(glade_data)
 DISTCLEANFILES = $(extensionini_DATA)
 
-EXTRA_DIST = $(glade_DATA) $(extensionini_in_files)
+EXTRA_DIST = $(glade_in_files) $(extensionini_in_files)

Modified: trunk/extensions/extensions-manager-ui/extensions-manager-ui.c
==============================================================================
--- trunk/extensions/extensions-manager-ui/extensions-manager-ui.c	(original)
+++ trunk/extensions/extensions-manager-ui/extensions-manager-ui.c	Tue Feb 10 10:15:50 2009
@@ -422,7 +422,7 @@
 
 	ephy_dialog_construct (EPHY_DIALOG (dialog),
 			       properties,
-			       SHARE_DIR "/glade/extensions-manager-ui.glade",
+			       SHARE_DIR "/glade/extensions-manager-ui.ui",
 			       "extensions_manager_ui",
 			       GETTEXT_PACKAGE);