Read authors (updated) and documenters (updated) from eom.about gresource

2 files changed, 34 insertions, 35 deletions

diff --git a/src/eom-window.c b/src/eom-window.c
index bc5ca59..7b748c8 100644
--- a/src/eom-window.c
+++ b/src/eom-window.c
@@ -2519,6 +2519,9 @@ eom_window_cmd_help (GtkAction *action, gpointer user_data)
 	eom_util_show_help (NULL, GTK_WINDOW (window));
 }
 
+#define ABOUT_GROUP "About"
+#define EMAILIFY(string) (g_strdelimit ((string), "%", '@'))
+
 static void
 eom_window_cmd_about (GtkAction *action, gpointer user_data)
 {
@@ -2526,38 +2529,6 @@ eom_window_cmd_about (GtkAction *action, gpointer user_data)
 
 	g_return_if_fail (EOM_IS_WINDOW (user_data));
 
-	static const char *authors[] = {
-		"Perberos <[email protected]>",
-		"Steve Zesch <[email protected]>",
-		"Stefano Karapetsas <[email protected]>",
-		"",
-		"Claudio Saavedra <[email protected]> (maintainer)",
-		"Felix Riemann <[email protected]> (maintainer)",
-		"",
-		"Lucas Rocha <[email protected]>",
-		"Tim Gerla <[email protected]>",
-		"Philip Van Hoof <[email protected]>",
-                "Paolo Borelli <[email protected]>",
-		"Jens Finke <[email protected]>",
-		"Martin Baulig <[email protected]>",
-		"Arik Devens <[email protected]>",
-		"Michael Meeks <[email protected]>",
-		"Federico Mena-Quintero <[email protected]>",
-		"Lutz M\xc3\xbcller <[email protected]>",
-		NULL
-	};
-
-	static const char *documenters[] = {
-		"Eliot Landrum <[email protected]>",
-		"Federico Mena-Quintero <[email protected]>",
-		"Sun GNOME Documentation Team <[email protected]>",
-		NULL
-	};
-
-	const char *translators;
-
-	translators = _("translator-credits");
-
 	const char *license[] = {
 		N_("This program is free software; you can redistribute it and/or modify "
 		   "it under the terms of the GNU General Public License as published by "
@@ -2573,9 +2544,34 @@ eom_window_cmd_about (GtkAction *action, gpointer user_data)
 	};
 
 	char *license_trans;
+	GKeyFile *key_file;
+	GBytes *bytes;
+	const guint8 *data;
+	gsize data_len;
+	GError *error = NULL;
+	char **authors, **documenters;
+	gsize n_authors = 0, n_documenters = 0 , i;
+
+	bytes = g_resources_lookup_data ("/org/mate/eom/ui/eom.about", G_RESOURCE_LOOKUP_FLAGS_NONE, &error);
+	g_assert_no_error (error);
+
+	data = g_bytes_get_data (bytes, &data_len);
+	key_file = g_key_file_new ();
+	g_key_file_load_from_data (key_file, (const char *) data, data_len, 0, &error);
+	g_assert_no_error (error);
+
+	authors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Authors", &n_authors, NULL);
+	documenters = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Documenters", &n_documenters, NULL);
+
+	g_key_file_free (key_file);
+	g_bytes_unref (bytes);
+
+	for (i = 0; i < n_authors; ++i)
+		authors[i] = EMAILIFY (authors[i]);
+	for (i = 0; i < n_documenters; ++i)
+		documenters[i] = EMAILIFY (documenters[i]);
 
-	license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n",
-				     _(license[2]), "\n", NULL);
+	license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n", _(license[2]), "\n", NULL);
 
 	window = EOM_WINDOW (user_data);
 
@@ -2589,13 +2585,15 @@ eom_window_cmd_about (GtkAction *action, gpointer user_data)
 			       "comments",_("The MATE image viewer."),
 			       "authors", authors,
 			       "documenters", documenters,
-			       "translator-credits", translators,
+			       "translator-credits", _("translator-credits"),
 			       "website", "http://www.mate-desktop.org/",
 			       "logo-icon-name", "eom",
 			       "wrap-license", TRUE,
 			       "license", license_trans,
 			       NULL);
 
+	g_strfreev (authors);
+	g_strfreev (documenters);
 	g_free (license_trans);
 }
 
diff --git a/src/eom.gresource.xml b/src/eom.gresource.xml
index 1904e8c..f06d5c7 100644
--- a/src/eom.gresource.xml
+++ b/src/eom.gresource.xml
@@ -7,6 +7,7 @@
     <file compressed="true" preprocess="xml-stripblanks">eom-preferences-dialog.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">eom-ui.xml</file>
     <file compressed="true" preprocess="xml-stripblanks">metadata-sidebar.ui</file>
+    <file compressed="true">eom.about</file>
     <file>pixmaps/thumbnail-frame.png</file>
   </gresource>
 </gresources>