aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2011-12-15 04:24:21 +0800
committerXan Lopez <xan@igalia.com>2011-12-15 04:24:21 +0800
commitf60cd7fc43d25855cafaab84e655e0f2b99c95ee (patch)
treeb5c40d8250cd3e8e4b2a630411c7cf648bd78248
parent049e9612e7676c87ac0f011ec56340614e513cab (diff)
downloadgsoc2013-epiphany-f60cd7fc43d25855cafaab84e655e0f2b99c95ee.tar
gsoc2013-epiphany-f60cd7fc43d25855cafaab84e655e0f2b99c95ee.tar.gz
gsoc2013-epiphany-f60cd7fc43d25855cafaab84e655e0f2b99c95ee.tar.bz2
gsoc2013-epiphany-f60cd7fc43d25855cafaab84e655e0f2b99c95ee.tar.lz
gsoc2013-epiphany-f60cd7fc43d25855cafaab84e655e0f2b99c95ee.tar.xz
gsoc2013-epiphany-f60cd7fc43d25855cafaab84e655e0f2b99c95ee.tar.zst
gsoc2013-epiphany-f60cd7fc43d25855cafaab84e655e0f2b99c95ee.zip
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.
-rw-r--r--configure.ac1
-rw-r--r--data/Makefile.am2
-rw-r--r--data/glade/Makefile.am10
-rw-r--r--data/ui/Makefile.am11
-rw-r--r--data/ui/certificate-dialogs.ui (renamed from data/glade/certificate-dialogs.ui)0
-rw-r--r--data/ui/epiphany.ui (renamed from data/glade/epiphany.ui)0
-rw-r--r--data/ui/form-signing-dialog.ui (renamed from data/glade/form-signing-dialog.ui)0
-rw-r--r--data/ui/prefs-dialog.ui (renamed from data/glade/prefs-dialog.ui)0
-rw-r--r--data/ui/print.ui (renamed from data/glade/print.ui)0
-rw-r--r--po/POTFILES.in10
10 files changed, 16 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac
index 35fd9006a..954d20b33 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 6fcfa8144..2da510465 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/glade/Makefile.am b/data/glade/Makefile.am
deleted file mode 100644
index 1f4b9a124..000000000
--- a/data/glade/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-gladedir = $(pkgdatadir)/glade
-glade_DATA = \
- certificate-dialogs.ui \
- epiphany.ui \
- form-signing-dialog.ui \
- prefs-dialog.ui \
- print.ui
-
-EXTRA_DIST = $(glade_DATA)
-
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 4e148e1c6..64cae58fa 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
index 6cda633a8..6cda633a8 100644
--- a/data/glade/certificate-dialogs.ui
+++ b/data/ui/certificate-dialogs.ui
diff --git a/data/glade/epiphany.ui b/data/ui/epiphany.ui
index d2f87c51e..d2f87c51e 100644
--- a/data/glade/epiphany.ui
+++ b/data/ui/epiphany.ui
diff --git a/data/glade/form-signing-dialog.ui b/data/ui/form-signing-dialog.ui
index dee534253..dee534253 100644
--- a/data/glade/form-signing-dialog.ui
+++ b/data/ui/form-signing-dialog.ui
diff --git a/data/glade/prefs-dialog.ui b/data/ui/prefs-dialog.ui
index 471ef77b5..471ef77b5 100644
--- a/data/glade/prefs-dialog.ui
+++ b/data/ui/prefs-dialog.ui
diff --git a/data/glade/print.ui b/data/ui/print.ui
index 8720b8413..8720b8413 100644
--- a/data/glade/print.ui
+++ b/data/ui/print.ui
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 78f4fff79..968165372 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