summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-04-16 12:34:34 +0200
committerXan Lopez <xan@igalia.com>2012-04-16 12:34:34 +0200
commit6ca351051cee2d7528a4c03a5ffb50a230be5327 (patch)
treee8ed7939f7a780041066204d737ba4570c7d4d89
parent0d0d1afa437f8ac25d85e090e318075dbdf0539d (diff)
downloadepiphany-6ca351051cee2d7528a4c03a5ffb50a230be5327.tar.gz
Move resources to its own directory inside src/
-rw-r--r--po/POTFILES.in6
-rw-r--r--src/Makefile.am18
-rw-r--r--src/resources/epiphany-application-menu.ui (renamed from src/epiphany-application-menu.ui)0
-rw-r--r--src/resources/epiphany-bookmark-editor-ui.xml (renamed from src/epiphany-bookmark-editor-ui.xml)0
-rw-r--r--src/resources/epiphany-history-window-ui.xml (renamed from src/epiphany-history-window-ui.xml)0
-rw-r--r--src/resources/epiphany-ui.xml (renamed from src/epiphany-ui.xml)0
-rw-r--r--src/resources/epiphany.css (renamed from src/epiphany.css)0
-rw-r--r--src/resources/epiphany.ui (renamed from src/epiphany.ui)0
-rw-r--r--src/resources/prefs-dialog.ui (renamed from src/prefs-dialog.ui)0
9 files changed, 12 insertions, 12 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 49c256818..44149477d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,6 +41,9 @@ src/bookmarks/ephy-open-tabs-action.c
src/bookmarks/ephy-topic-action.c
src/bookmarks/ephy-topics-entry.c
src/bookmarks/ephy-topics-palette.c
+[type: gettext/glade]src/resources/epiphany-application-menu.ui
+[type: gettext/glade]src/resources/epiphany.ui
+[type: gettext/glade]src/resources/prefs-dialog.ui
src/ephy-combined-stop-reload-action.c
src/ephy-encoding-dialog.c
src/ephy-encoding-menu.c
@@ -52,10 +55,7 @@ src/ephy-notebook.c
src/ephy-session.c
src/ephy-shell.c
src/ephy-window.c
-[type: gettext/glade]src/epiphany-application-menu.ui
-[type: gettext/glade]src/epiphany.ui
src/pdm-dialog.c
src/popup-commands.c
src/prefs-dialog.c
-[type: gettext/glade]src/prefs-dialog.ui
src/window-commands.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 634b5a8a7..8e1110a3e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -110,20 +110,20 @@ libephymain_la_CFLAGS = \
$(AM_CFLAGS)
UI_FILES = \
- epiphany-bookmark-editor-ui.xml \
- epiphany-history-window-ui.xml \
- epiphany-ui.xml \
- epiphany.ui \
- epiphany-application-menu.ui \
- prefs-dialog.ui \
- epiphany.css \
+ resources/epiphany-bookmark-editor-ui.xml \
+ resources/epiphany-history-window-ui.xml \
+ resources/epiphany-ui.xml \
+ resources/epiphany.ui \
+ resources/epiphany-application-menu.ui \
+ resources/prefs-dialog.ui \
+ resources/epiphany.css \
$(NULL)
epiphany-resources.c: epiphany.gresource.xml $(UI_FILES)
- $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name epiphany $(srcdir)/epiphany.gresource.xml
+ $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir)/resources --generate-source --c-name epiphany $(srcdir)/epiphany.gresource.xml
epiphany-resources.h: epiphany.gresource.xml $(UI_FILES)
- $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name epiphany $(srcdir)/epiphany.gresource.xml
+ $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir)/resources --generate-header --c-name epiphany $(srcdir)/epiphany.gresource.xml
EPIPHANY_RESOURCES = \
epiphany-resources.c \
diff --git a/src/epiphany-application-menu.ui b/src/resources/epiphany-application-menu.ui
index 87d3d8b57..87d3d8b57 100644
--- a/src/epiphany-application-menu.ui
+++ b/src/resources/epiphany-application-menu.ui
diff --git a/src/epiphany-bookmark-editor-ui.xml b/src/resources/epiphany-bookmark-editor-ui.xml
index dcad18063..dcad18063 100644
--- a/src/epiphany-bookmark-editor-ui.xml
+++ b/src/resources/epiphany-bookmark-editor-ui.xml
diff --git a/src/epiphany-history-window-ui.xml b/src/resources/epiphany-history-window-ui.xml
index 34ed6110c..34ed6110c 100644
--- a/src/epiphany-history-window-ui.xml
+++ b/src/resources/epiphany-history-window-ui.xml
diff --git a/src/epiphany-ui.xml b/src/resources/epiphany-ui.xml
index c4789036f..c4789036f 100644
--- a/src/epiphany-ui.xml
+++ b/src/resources/epiphany-ui.xml
diff --git a/src/epiphany.css b/src/resources/epiphany.css
index b3b9757e3..b3b9757e3 100644
--- a/src/epiphany.css
+++ b/src/resources/epiphany.css
diff --git a/src/epiphany.ui b/src/resources/epiphany.ui
index bca48b56d..bca48b56d 100644
--- a/src/epiphany.ui
+++ b/src/resources/epiphany.ui
diff --git a/src/prefs-dialog.ui b/src/resources/prefs-dialog.ui
index 4aff7decf..4aff7decf 100644
--- a/src/prefs-dialog.ui
+++ b/src/resources/prefs-dialog.ui