Skip to content

Commit 5379181

Browse files
rbujraveit65
rbuj
authored and
raveit65
committed
Read authors and documenters fom caja.about file
1 parent f5e08dd commit 5379181

File tree

3 files changed

+37
-109
lines changed

3 files changed

+37
-109
lines changed

‎src/Makefile.am‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,11 @@ caja_connect_server_SOURCES = \
197197
$(NULL)
198198

199199

200+
aboutdir = $(datadir)/caja
201+
about_DATA = \
202+
caja.about \
203+
$(NULL)
204+
200205
if ENABLE_SELF_CHECK
201206
TESTS=check-caja
202207
endif
@@ -224,6 +229,7 @@ EXTRA_DIST = \
224229
$(server_in_files) \
225230
$(ui_DATA) \
226231
check-caja \
232+
$(about_DATA) \
227233
$(desktop_in_files) \
228234
$(NULL)
229235

‎src/caja-window-menus.c‎

Lines changed: 28 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -506,113 +506,13 @@ action_backgrounds_and_emblems_callback (GtkAction *action,
506506
caja_property_browser_show (gtk_window_get_screen (window));
507507
}
508508

509+
#define ABOUT_GROUP "About"
510+
#define EMAILIFY(string) (g_strdelimit ((string), "%", '@'))
511+
509512
static void
510513
action_about_caja_callback (GtkAction *action,
511514
gpointer user_data)
512515
{
513-
const gchar *authors[] =
514-
{
515-
"Adam Erdman <hekel@archlinux.info>",
516-
"Alexander Larsson",
517-
"Alexander van der Meij <alexandervdm@gliese.me>",
518-
"Alexandru Pandelea <alexandru.pandelea@gmail.com>",
519-
"Alexei Sorokin <sor.alexei@meowr.ru>",
520-
"Ali Abdin",
521-
"Anders Carlsson",
522-
"Andrea Azzarone <azzaronea@gmail.com>",
523-
"Andy Hertzfeld",
524-
"Arlo Rose",
525-
"Balló György <ballogyor@gmail.com>",
526-
"Benjamin Valentin <benpicco@zedat.fu-berlin.de>",
527-
"Boris Egorov <egorov@linux.com>",
528-
"Brent Hull <bhull2010@live.com>",
529-
"Chen Donghai <chen.donghai@zte.com.cn>",
530-
"Clement Lefebvre <clement.lefebvre@linuxmint.com>",
531-
"Clément Masci",
532-
"Colomban Wendling <cwendling@hypra.fr>",
533-
"Cosimo Cecchi <cosimoc@gnome.org>",
534-
"Dan Bravender <dan.bravender@gmail.com>",
535-
"Darin Adler",
536-
"David Camp",
537-
"E.S. Quinn <onetruequinn@hotmail.com>",
538-
"Elan Ruusamäe <glen@delfi.ee>",
539-
"Eli Goldberg",
540-
"Elias Aebi <user142@hotmail.com>",
541-
"Elliot Lee",
542-
"Eskil Heyn Olsen",
543-
"Ettore Perazzoli",
544-
"Felipe Barriga Richards <spam@felipebarriga.cl>",
545-
"Franco Tortoriello <torto9@users.noreply.github.com>",
546-
"Galik <galik.bool@gmail.com>",
547-
"Gene Z. Ragan",
548-
"George Lebl",
549-
"Ian McKellar",
550-
"Ikey Doherty <ikey@solus-project.com>",
551-
"J Shane Culpepper",
552-
"James Willcox",
553-
"Jan Arne Petersen",
554-
"Jan Niklas Hasse <jhasse@bixense.com>",
555-
"Jasmine Hassan <jasmine.aura@gmail.com>",
556-
"Joanmarie Diggs <jdiggs@igalia.com>",
557-
"John Harper",
558-
"John Sullivan",
559-
"Josh Barrow",
560-
"Jury Verrigni <jury.verrigni@gmail.com>",
561-
"Lars R. Damerow <lars@pixar.com>",
562-
"Laszlo Boros <iamsemmu@gmail.com>",
563-
"Lionel Landwerlin <lionel.g.landwerlin@intel.com>",
564-
"Luke Yelavich <themuso@ubuntu.com>",
565-
"Maciej Stachowiak",
566-
"Marcel Dijkstra <marcel.dykstra@gmail.com>",
567-
"Mark McLoughlin",
568-
"Martin Matuska <martin@matuska.org>",
569-
"Martin Pieuchot <mpi@grenadille.net>",
570-
"Martin Wimpress <martin@mate-desktop.org>",
571-
"Mathieu Lacage",
572-
"Max Eliaser <max@meliaserlow.dyndns.tv>",
573-
"Michael Catanzaro <mcatanzaro@gnome.org>",
574-
"Mike Engber",
575-
"Mike Fleming",
576-
"Mike Gabriel <mike.gabriel@das-netzwerkteam.de>",
577-
"Moritz Bruder <muesli4@gmail.com>",
578-
"Nelson Marques <nmo.marques@gmail.com>",
579-
"Obata Akio <obache@users.noreply.github.com>",
580-
"Pablo Barciela <scow@riseup.net>",
581-
"Pavel Cisler",
582-
"Perberos <perberos@gmail.com>",
583-
"Phillip Susi <psusi@ubuntu.com>",
584-
"Piotr Drąg <piotrdrag@gmail.com>",
585-
"Ramiro Estrugo",
586-
"Raph Levien",
587-
"Rebecca Schulman",
588-
"Robey Pointer",
589-
"Robin * Slomkowski",
590-
"Samuel Thibault <samuel.thibault@ens-lyon.org>",
591-
"Sander Sweers <infirit@gmail.com>",
592-
"Sargastic <sargastic@gmail.com>",
593-
"Scott Balneaves <sbalneav@mate-desktop.org>",
594-
"Seth Nickell",
595-
"Stefano Karapetsas <stefano@karapetsas.com>",
596-
"Steve Zesch <stevezesch2@gmail.com>",
597-
"Susan Kare",
598-
"Tomas Bzatek <tbzatek@redhat.com>",
599-
"Victor Kareh <vkareh@redhat.com>",
600-
"Vlad Orlov <monsta@inbox.ru>",
601-
"Wolfgang Ulbrich <mate@raveit.de>",
602-
"Wu Xiaotian <yetist@gmail.com>",
603-
"Yaakov Selkowitz <yselkowitz@users.sourceforge.net>",
604-
"Zhang Xianwei <zhang.xianwei8@zte.com.cn>",
605-
"张雯 <zhang.wen2@zte.com.cn>",
606-
"高群凯 <lenky0401@gmail.com>",
607-
NULL
608-
};
609-
const gchar *documenters[] =
610-
{
611-
"MATE Documentation Team",
612-
"GNOME Documentation Team",
613-
"Sun Microsystems",
614-
NULL
615-
};
616516
const gchar *license[] =
617517
{
618518
N_("Caja is free software; you can redistribute it and/or modify "
@@ -628,9 +528,30 @@ action_about_caja_callback (GtkAction *action,
628528
"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA")
629529
};
630530
gchar *license_trans;
531+
GKeyFile *key_file;
532+
GError *error = NULL;
533+
char **authors, **documenters;
534+
gsize n_authors = 0, n_documenters = 0 , i;
535+
536+
key_file = g_key_file_new ();
537+
if (!g_key_file_load_from_file (key_file, CAJA_DATADIR G_DIR_SEPARATOR_S "caja.about", 0, &error))
538+
{
539+
g_warning ("Couldn't load about data: %s\n", error->message);
540+
g_error_free (error);
541+
g_key_file_free (key_file);
542+
return;
543+
}
544+
545+
authors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Authors", &n_authors, NULL);
546+
documenters = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Documenters", &n_documenters, NULL);
547+
g_key_file_free (key_file);
548+
549+
for (i = 0; i < n_authors; ++i)
550+
authors[i] = EMAILIFY (authors[i]);
551+
for (i = 0; i < n_documenters; ++i)
552+
documenters[i] = EMAILIFY (documenters[i]);
631553

632-
license_trans = g_strjoin ("\n\n", _(license[0]), _(license[1]),
633-
_(license[2]), NULL);
554+
license_trans = g_strjoin ("\n\n", _(license[0]), _(license[1]), _(license[2]), NULL);
634555

635556
gtk_show_about_dialog (GTK_WINDOW (user_data),
636557
"program-name", _("Caja"),
@@ -645,16 +566,14 @@ action_about_caja_callback (GtkAction *action,
645566
"wrap-license", TRUE,
646567
"authors", authors,
647568
"documenters", documenters,
648-
/* Translators should localize the following string
649-
* which will be displayed at the bottom of the about
650-
* box to give credit to the translator(s).
651-
*/
652569
"translator-credits", _("translator-credits"),
653570
"logo-icon-name", "system-file-manager",
654571
"website", "http://www.mate-desktop.org",
655572
"website-label", _("MATE Web Site"),
656573
NULL);
657574

575+
g_strfreev (authors);
576+
g_strfreev (documenters);
658577
g_free (license_trans);
659578

660579
}

‎src/caja.about‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[About]
2+
Authors=Adam Erdman <hekel%archlinux.info>;Alexander Larsson;Alexander van der Meij <alexandervdm%gliese.me>;Alexandru Pandelea <alexandru.pandelea%gmail.com>;Alexei Sorokin <sor.alexei%meowr.ru>;Ali Abdin;Anders Carlsson;Andrea Azzarone <azzaronea%gmail.com>;Andy Hertzfeld;Arlo Rose;Balló György <ballogyor%gmail.com>;Benjamin Valentin <benpicco%zedat.fu-berlin.de>;Boris Egorov <egorov%linux.com>;Brent Hull <bhull2010%live.com>;Chen Donghai <chen.donghai%zte.com.cn>;Clement Lefebvre <clement.lefebvre%linuxmint.com>;Clément Masci;Colomban Wendling <cwendling%hypra.fr>;Cosimo Cecchi <cosimoc%gnome.org>;Dan Bravender <dan.bravender%gmail.com>;Darin Adler;David Camp;E.S. Quinn <onetruequinn%hotmail.com>;Elan Ruusamäe <glen%delfi.ee>;Eli Goldberg;Elias Aebi <user142%hotmail.com>;Elliot Lee;Eskil Heyn Olsen;Ettore Perazzoli;Felipe Barriga Richards <spam%felipebarriga.cl>;Franco Tortoriello <torto9%users.noreply.github.com>;Galik <galik.bool%gmail.com>;Gene Z. Ragan;George Lebl;Ian McKellar;Ikey Doherty <ikey%solus-project.com>;J Shane Culpepper;James Willcox;Jan Arne Petersen;Jan Niklas Hasse <jhasse%bixense.com>;Jasmine Hassan <jasmine.aura%gmail.com>;Joanmarie Diggs <jdiggs%igalia.com>;John Harper;John Sullivan;Josh Barrow;Jury Verrigni <jury.verrigni%gmail.com>;Lars R. Damerow <lars%pixar.com>;Laszlo Boros <iamsemmu%gmail.com>;Lionel Landwerlin <lionel.g.landwerlin%intel.com>;Luke Yelavich <themuso%ubuntu.com>;Maciej Stachowiak;Marcel Dijkstra <marcel.dykstra%gmail.com>;Mark McLoughlin;Martin Matuska <martin%matuska.org>;Martin Pieuchot <mpi%grenadille.net>;Martin Wimpress <martin%mate-desktop.org>;Mathieu Lacage;Max Eliaser <max%meliaserlow.dyndns.tv>;Michael Catanzaro <mcatanzaro%gnome.org>;Mike Engber;Mike Fleming;Mike Gabriel <mike.gabriel%das-netzwerkteam.de>;Moritz Bruder <muesli4%gmail.com>;Nelson Marques <nmo.marques%gmail.com>;Obata Akio <obache%users.noreply.github.com>;Pablo Barciela <scow%riseup.net>;Pavel Cisler;Perberos <perberos%gmail.com>;Phillip Susi <psusi%ubuntu.com>;Piotr Drąg <piotrdrag%gmail.com>;Ramiro Estrugo;Raph Levien;Rebecca Schulman;Robey Pointer;Robin * Slomkowski;Samuel Thibault <samuel.thibault%ens-lyon.org>;Sander Sweers <infirit%gmail.com>;Sargastic <sargastic%gmail.com>;Scott Balneaves <sbalneav%mate-desktop.org>;Seth Nickell;Stefano Karapetsas <stefano%karapetsas.com>;Steve Zesch <stevezesch2%gmail.com>;Susan Kare;Tomas Bzatek <tbzatek%redhat.com>;Victor Kareh <vkareh%redhat.com>;Vlad Orlov <monsta%inbox.ru>;Wolfgang Ulbrich <mate%raveit.de>;Wu Xiaotian <yetist%gmail.com>;Yaakov Selkowitz <yselkowitz%users.sourceforge.net>;Zhang Xianwei <zhang.xianwei8%zte.com.cn>;张雯 <zhang.wen2%zte.com.cn>;高群凯 <lenky0401%gmail.com>;
3+
Documenters=MATE Documentation Team;GNOME Documentation Team;Sun Microsystems;

0 commit comments

Comments
 (0)