[epiphany] Move about.ini to the gresource

[Michael Catanzaro <mcatanzaro src gnome org>]

commit bb5963a08cf78d1366aab03afd69f8587306e0f1
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Oct 17 14:31:20 2016 -0500

    Move about.ini to the gresource
    
    Also, update contributors list

 data/Makefile.am                     |    3 ---
 {data => src/resources}/about.ini    |    4 ++--
 src/resources/epiphany.gresource.xml |    1 +
 src/window-commands.c                |    6 ++++--
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index cf99150..0396bb6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -20,9 +20,6 @@ appstream_XML = $(appstream_in_files:.xml.in=.xml)
 $(appstream_XML): $(appstream_in_files)
        $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
-aboutdialogdir = $(pkgdatadir)
-dist_aboutdialog_DATA = about.ini
-
 mimepermissiondir = $(pkgdatadir)
 dist_mimepermission_DATA = mime-types-permissions.xml
 
diff --git a/data/about.ini b/src/resources/about.ini
similarity index 68%
rename from data/about.ini
rename to src/resources/about.ini
index 678331d..d39bf2d 100644
--- a/data/about.ini
+++ b/src/resources/about.ini
@@ -1,6 +1,6 @@
 [About]
-Authors=Xan López;Gustavo Noronha;Claudio Saavedra;Carlos García Campos;Michael Catanzaro;
+Authors=Carlos García Campos;Michael Catanzaro;
 Contributors=Wouter Bolsterlee;Crispin Flowerday;Peter Harvey;Reinout van Schouwen;Raphaël Slinckx;Cyril 
Brulebois;Cosimo Cecchi;William Jon McCann;Arnaud Bonatti;
-PastAuthors=Marco Pesenti Gritti;David Bordoley;Adam Hooper;Christian Persch;Jean-François Rameau;Diego 
Escalante Urrelo;
+PastAuthors=Marco Pesenti Gritti;David Bordoley;Adam Hooper;Christian Persch;Jean-François Rameau;Diego 
Escalante Urrelo;Xan López;Gustavo Noronha;Claudio Saavedra;
 Artists=Andreas Nilsson;Jakub Steiner;Lapo Calamandrei;
 Documenters=Ekaterina Gerasimova;
diff --git a/src/resources/epiphany.gresource.xml b/src/resources/epiphany.gresource.xml
index c5861d6..37f2029 100644
--- a/src/resources/epiphany.gresource.xml
+++ b/src/resources/epiphany.gresource.xml
@@ -6,6 +6,7 @@
     <file>incognito.png</file>
     <file>missing-thumbnail.png</file>
     <file>network-error-symbolic.png</file>
+    <file compressed="true">about.ini</file>
     <file compressed="true">epiphany.css</file>
     <file compressed="true">prism.css</file>
     <file compressed="true">prism.js</file>
diff --git a/src/window-commands.c b/src/window-commands.c
index e26cd54..be4c996 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -163,17 +163,19 @@ window_cmd_show_about (GSimpleAction *action,
   EphyWindow *window = EPHY_WINDOW (user_data);
   char *comments = NULL;
   GKeyFile *key_file;
+  GBytes *bytes;
   GError *error = NULL;
   char **list, **authors, **contributors, **past_authors, **artists, **documenters;
   gsize n_authors, n_contributors, n_past_authors, n_artists, n_documenters, i, j;
 
   key_file = g_key_file_new ();
-  if (!g_key_file_load_from_file (key_file, PKGDATADIR G_DIR_SEPARATOR_S "about.ini",
-                                  0, &error)) {
+  bytes = g_resources_lookup_data ("/org/gnome/epiphany/about.ini", 0, NULL);
+  if (!g_key_file_load_from_data (key_file, g_bytes_get_data (bytes, NULL), -1, 0, &error)) {
     g_warning ("Couldn't load about data: %s\n", error->message);
     g_error_free (error);
     return;
   }
+  g_bytes_unref (bytes);
 
   list = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Authors",
                                      &n_authors, NULL);