[gnome-maps/wip/binary: 3/4] Rename data resource file
- From: Mattias Bengtsson <mattiasb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps/wip/binary: 3/4] Rename data resource file
- Date: Wed, 22 Jan 2014 05:50:38 +0000 (UTC)
commit 468aef9a7252bc5fcc1966ad999029cc767e1481
Author: Mattias Bengtsson <mattias jc bengtsson gmail com>
Date: Wed Jan 22 06:33:32 2014 +0100
Rename data resource file
Rename the data resource file so that the filename actually contains the
word 'data', indicating what it is.
src/Makefile.am | 10 +++++-----
src/application.js | 2 +-
...gresource.xml => gnome-maps.data.gresource.xml} | 0
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 94bb834..411251e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,20 +22,20 @@ include Makefile-js.am
resource_files = $(shell $(GLIB_COMPILE_RESOURCES) \
--sourcedir=$(srcdir) \
- --generate-dependencies $(srcdir)/gnome-maps.gresource.xml)
+ --generate-dependencies $(srcdir)/gnome-maps.data.gresource.xml)
-gnome-maps.gresource: gnome-maps.gresource.xml $(resource_files)
+gnome-maps.data.gresource: gnome-maps.data.gresource.xml $(resource_files)
$(AM_V_GEN) \
$(GLIB_COMPILE_RESOURCES) \
--target=$@ \
--sourcedir=$(srcdir) $<
-EXTRA_DIST += gnome-maps.gresource.xml $(resource_files)
+EXTRA_DIST += gnome-maps.data.gresource.xml $(resource_files)
resourcedir = $(pkgdatadir)
-resource_DATA = gnome-maps.gresource
+resource_DATA = gnome-maps.data.gresource
-CLEANFILES += gnome-maps.gresource
+CLEANFILES += gnome-maps.data.gresource
bin_SCRIPTS = gnome-maps
diff --git a/src/application.js b/src/application.js
index 3a67dc6..6e4185b 100644
--- a/src/application.js
+++ b/src/application.js
@@ -75,7 +75,7 @@ const Application = new Lang.Class({
GtkClutter.init(null);
- let resource = Gio.Resource.load(Path.RESOURCE_DIR + '/gnome-maps.gresource');
+ let resource = Gio.Resource.load(Path.RESOURCE_DIR + '/gnome-maps.data.gresource');
resource._register();
Utils.loadStyleSheet(Gio.file_new_for_uri('resource:///org/gnome/maps/application.css'));
diff --git a/src/gnome-maps.gresource.xml b/src/gnome-maps.data.gresource.xml
similarity index 100%
rename from src/gnome-maps.gresource.xml
rename to src/gnome-maps.data.gresource.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]