[polari] data: Rename resource file to $(APP_ID).data.gresource

[Florian Müllner <fmuellner src gnome org>]

commit 25ad6640f9bb27fe7c9e03071c9ecf3e0f6cf416
Author: Florian Müllner <fmuellner gnome org>
Date:   Sun Feb 22 22:31:16 2015 +0100

    data: Rename resource file to $(APP_ID).data.gresource
    
    With this change, the package module will load the resource
    automatically for us. Apart from a bit of convenience, resource
    loading now happens before any of our own JS modules is imported,
    which is a precondition for using GTK+ templates.

 data/Makefile.am                                   |    8 ++++----
 ...rce.xml => org.gnome.Polari.data.gresource.xml} |    0
 src/application.js                                 |    3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index dc685c5..d257e4f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,12 +16,12 @@ $(APP_ID).service: $(APP_ID).service.in Makefile
 check-local:
        $(DESKTOP_FILE_VALIDATE) $(desktop_DATA)
 
-resource_files=$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/polari.gresource.xml)
-polari.gresource: polari.gresource.xml $(resource_files)
+resource_files=$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/$(APP_ID).data.gresource.xml)
+$(APP_ID).data.gresource: $(APP_ID).data.gresource.xml $(resource_files)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
 
 resourcedir=$(pkgdatadir)
-resource_DATA=polari.gresource
+resource_DATA=$(APP_ID).data.gresource
 
 gsettings_SCHEMAS = $(APP_ID).gschema.xml
 @GSETTINGS_RULES@
@@ -29,7 +29,7 @@ gsettings_SCHEMAS = $(APP_ID).gschema.xml
 EXTRA_DIST = \
        $(desktop_in_files) \
        $(service_in_files) \
-       polari.gresource.xml \
+       $(APP_ID).data.gresource.xml \
        $(resource_files) \
        $(gsettings_SCHEMAS) \
        $(NULL)
diff --git a/data/polari.gresource.xml b/data/org.gnome.Polari.data.gresource.xml
similarity index 100%
rename from data/polari.gresource.xml
rename to data/org.gnome.Polari.data.gresource.xml
diff --git a/src/application.js b/src/application.js
index 8ad62b6..3006927 100644
--- a/src/application.js
+++ b/src/application.js
@@ -34,9 +34,6 @@ const Application = new Lang.Class({
     },
 
     vfunc_startup: function() {
-        let resource = Gio.Resource.load(pkg.pkgdatadir + '/polari.gresource');
-        resource._register();
-
         this.parent();
 
         let w = new Polari.FixedSizeFrame(); // register gtype