[epiphany] Move GtkBuilder files to data/ui

[Xan Lopez <xan src gnome org>]

commit f60cd7fc43d25855cafaab84e655e0f2b99c95ee
Author: Xan Lopez <xan igalia com>
Date:   Wed Dec 14 21:24:21 2011 +0100

    Move GtkBuilder files to data/ui
    
    There's not much point in having two UI files (glade/ and ui/), and
    besides the files were not actually in glade format anymore.

 configure.ac                              |    1 -
 data/Makefile.am                          |    2 +-
 data/glade/Makefile.am                    |   10 ----------
 data/ui/Makefile.am                       |   11 ++++++++++-
 data/{glade => ui}/certificate-dialogs.ui |    0
 data/{glade => ui}/epiphany.ui            |    0
 data/{glade => ui}/form-signing-dialog.ui |    0
 data/{glade => ui}/prefs-dialog.ui        |    0
 data/{glade => ui}/print.ui               |    0
 po/POTFILES.in                            |   10 +++++-----
 10 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 35fd900..954d20b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,7 +324,6 @@ data/Makefile
 data/epiphany-${EPIPHANY_API_VERSION}.pc:data/epiphany.pc.in
 data/epiphany.desktop.in
 data/bme.desktop.in
-data/glade/Makefile
 data/icons/Makefile
 data/art/Makefile
 data/pages/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 6fcfa81..2da5104 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = art glade icons pages ui
+SUBDIRS = art icons pages ui
 
 @INTLTOOL_SERVER_RULE@
 @INTLTOOL_DESKTOP_RULE@
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 4e148e1..64cae58 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -8,6 +8,15 @@ xml_DATA = \
 cssdir = $(pkgdatadir)
 css_DATA = epiphany.css
 
+gladedir = $(pkgdatadir)/glade
+glade_DATA = \
+	certificate-dialogs.ui		\
+	epiphany.ui			\
+	form-signing-dialog.ui		\
+	prefs-dialog.ui			\
+	print.ui
+
 EXTRA_DIST = \
 	$(xml_DATA) \
-	$(css_DATA)
+	$(css_DATA) \
+	$(glade_data)
diff --git a/data/glade/certificate-dialogs.ui b/data/ui/certificate-dialogs.ui
similarity index 100%
rename from data/glade/certificate-dialogs.ui
rename to data/ui/certificate-dialogs.ui
diff --git a/data/glade/epiphany.ui b/data/ui/epiphany.ui
similarity index 100%
rename from data/glade/epiphany.ui
rename to data/ui/epiphany.ui
diff --git a/data/glade/form-signing-dialog.ui b/data/ui/form-signing-dialog.ui
similarity index 100%
rename from data/glade/form-signing-dialog.ui
rename to data/ui/form-signing-dialog.ui
diff --git a/data/glade/prefs-dialog.ui b/data/ui/prefs-dialog.ui
similarity index 100%
rename from data/glade/prefs-dialog.ui
rename to data/ui/prefs-dialog.ui
diff --git a/data/glade/print.ui b/data/ui/print.ui
similarity index 100%
rename from data/glade/print.ui
rename to data/ui/print.ui
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 78f4fff..9681653 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,11 +4,11 @@
 data/bme.desktop.in.in
 [type: gettext/xml]data/default-bookmarks.rdf.in
 data/epiphany.desktop.in.in
-[type: gettext/glade]data/glade/certificate-dialogs.ui
-[type: gettext/glade]data/glade/epiphany.ui
-[type: gettext/glade]data/glade/form-signing-dialog.ui
-[type: gettext/glade]data/glade/prefs-dialog.ui
-[type: gettext/glade]data/glade/print.ui
+[type: gettext/glade]data/ui/certificate-dialogs.ui
+[type: gettext/glade]data/ui/epiphany.ui
+[type: gettext/glade]data/ui/form-signing-dialog.ui
+[type: gettext/glade]data/ui/prefs-dialog.ui
+[type: gettext/glade]data/ui/print.ui
 data/org.gnome.epiphany.gschema.xml.in
 embed/ephy-download.c
 embed/ephy-embed.c