From defb2af0d4d28ff9fa10dedc04ea12658665a77c Mon Sep 17 00:00:00 2001 From: Perberos Date: Fri, 2 Dec 2011 07:39:37 -0300 Subject: adding version tag --- mate-about/mate-about.c | 35 ++++++++++++++++++++++------------- mate-about/mate-about.h | 47 +++++++++++++++++++++++------------------------ 2 files changed, 45 insertions(+), 37 deletions(-) (limited to 'mate-about') diff --git a/mate-about/mate-about.c b/mate-about/mate-about.c index c513248..ce74312 100644 --- a/mate-about/mate-about.c +++ b/mate-about/mate-about.c @@ -23,6 +23,15 @@ #include "mate-about.h" +/* get text macro, this should be on the common macros. or not? + */ +#ifndef mate_gettext +#define mate_gettext(package, locale, codeset) \ + bindtextdomain(package, locale); \ + bind_textdomain_codeset(package, codeset); \ + textdomain(package); +#endif + // what a mess! #ifndef DISABLE_NYANCAT @@ -155,13 +164,13 @@ void mate_about_run(void) * This generate a random message. * The comments index must not be more than comments_count - 1 */ - gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(mate_about_dialog), gettext(comments[g_random_int_range(0, comments_count - 1)])); + gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(mate_about_dialog), gettext(comments_array[g_random_int_range(0, comments_count - 1)])); // autores gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(mate_about_dialog), authors); // I comment this because the list is empty - //gtk_about_dialog_set_artists(GTK_ABOUT_DIALOG(mate_about_dialog), artists); - //gtk_about_dialog_set_documenters(GTK_ABOUT_DIALOG(mate_about_dialog), documenters); + gtk_about_dialog_set_artists(GTK_ABOUT_DIALOG(mate_about_dialog), artists); + gtk_about_dialog_set_documenters(GTK_ABOUT_DIALOG(mate_about_dialog), documenters); #if GTK_CHECK_VERSION(3, 0, 0) gtk_about_dialog_set_license_type(GTK_ABOUT_DIALOG(mate_about_dialog), GTK_LICENSE_GPL_3_0); @@ -193,18 +202,18 @@ gint main(gint argc, gchar** argv) */ GError* error = NULL; - /** - * Con esto se inicia gettext - */ - bindtextdomain(gettext_package, locale_dir); - bind_textdomain_codeset(gettext_package, "UTF-8"); - textdomain(gettext_package); + /* Con esto se inicia gettext + * GETTEXT_PACKAGE = mate-desktop-2.0 + * LOCALE_DIR = /usr/local/share/locale + **/ + mate_gettext(GETTEXT_PACKAGE, LOCALE_DIR, "UTF-8"); + g_type_init(); /** * http://www.gtk.org/api/2.6/glib/glib-Commandline-option-parser.html */ GOptionContext* context = g_option_context_new(NULL); - g_option_context_add_main_entries(context, command_entries, gettext_package); + g_option_context_add_main_entries(context, command_entries, GETTEXT_PACKAGE); g_option_context_add_group(context, gtk_get_option_group(TRUE)); g_option_context_parse(context, &argc, &argv, &error); @@ -244,9 +253,9 @@ gint main(gint argc, gchar** argv) mate_about_run(); } - g_object_unref(mate_about_application); + //g_object_unref(mate_about_application); - #elif GTK_CHECK_VERSION(3, 0, 0) + #elif GTK_CHECK_VERSION(3, 0, 0) && !defined(USE_UNIQUE) mate_about_application = gtk_application_new("org.mate.about", 0); g_signal_connect(mate_about_application, "activate", G_CALLBACK(mate_about_on_activate), NULL); @@ -255,7 +264,7 @@ gint main(gint argc, gchar** argv) g_object_unref(mate_about_application); - #elif GLIB_CHECK_VERSION(2, 26, 0) + #elif GLIB_CHECK_VERSION(2, 26, 0) && !defined(USE_UNIQUE) mate_about_application = g_application_new("org.mate.about", G_APPLICATION_FLAGS_NONE); g_signal_connect(mate_about_application, "activate", G_CALLBACK(mate_about_on_activate), NULL); diff --git a/mate-about/mate-about.h b/mate-about/mate-about.h index 91cd4c4..b99c6fc 100644 --- a/mate-about/mate-about.h +++ b/mate-about/mate-about.h @@ -24,6 +24,7 @@ #include #include // for gettext + #include // autogenerated by ./configure #ifdef USE_UNIQUE @@ -32,15 +33,12 @@ //mate-about //{ - const gchar* gettext_package = GETTEXT_PACKAGE; // mate-desktop-2.0 - const gchar* locale_dir = LOCALE_DIR; // /usr/local/share/locale - - const gchar* program_name = "MATE Desktop Environment"; // MATE @PACKAGE_NAME@ - const gchar* version = PACKAGE_VERSION; - const gchar* icon = "desktop"; - const gchar* website = "http://www.matsusoft.com.ar/projects/mate/"; + const char* program_name = "MATE Desktop Environment"; // MATE @PACKAGE_NAME@ + const char* version = PACKAGE_VERSION; + const char* icon = "desktop"; + const char* website = "http://www.matsusoft.com.ar/projects/mate/"; - const gchar* copyright = "" + const char* copyright = "" "Copyright © 1997-2011 GNOME developers\n" "Copyright © 2011 Perberos"; // egoista! @@ -49,8 +47,8 @@ * en comments[]. Porque, este valor es usado en un random para obtener el * indice de la cadena. */ - const gint comments_count = 6; - const gchar* comments[] = { + const int comments_count = 6; + const char* comments_array[] = { "MATE also includes a complete development platform for applications " "programmers, allowing the creation of powerful and complex applications.", @@ -71,7 +69,7 @@ "translations, documentation, and quality assurance.", }; - const gchar* authors[] = { + const char* authors[] = { "Jérôme Abela", "Rob Adams", "Djihed Afifi", @@ -113,7 +111,7 @@ "Žygimantas Beručka", "Runa Bhattacharjee", "Robert Bihlmeyer", - "Jonathan Blandford", + "Jonathan Blandford ", "Christopher Blizzard", "Bruno Boaventura", "Евгени Боевски (Evgeni Boevski)", @@ -259,7 +257,7 @@ "Scott Heavner", "Sebastian Heinlein", "Jon K Hellan", - "James Henstridge", + "James Henstridge ", "Fernando Herrera", "Richard Hestilow", "Raphael Higino", @@ -275,7 +273,7 @@ "David Huggins-Daines", "Richard Hult", "Andreas Hyden", - "Miguel de Icaza", + "Miguel de Icaza ", "Hiroyuki Ikezoe", "Khandakar Mujahidul Islam", "Johnny Jacob", @@ -337,7 +335,7 @@ "Jason Leach", "George Lebl", "Gregory Leblanc", - "Elliot Lee", + "Elliot Lee ", "Marc Lehmann", "Noah Levitt", "Raph Levien", @@ -371,7 +369,7 @@ "James Mastros", "Peter Mattis", "Gordon Matzigkeit", - "Dietmar Maurer", + "Dietmar Maurer ", "Justin Maurer", "Shaun McCance", "William Jon McCann", @@ -391,7 +389,7 @@ "Paolo Molaro", "Lynn Monsanto", "David Mosberger", - "Rodrigo Moya", + "Rodrigo Moya ", "Dan Mueth", "Thomas Muldowney", "Alexandre Muñiz", @@ -552,7 +550,7 @@ "Chris Toshok", "Christoph Toshok", "Malcolm Tredinnick", - "Tom Tromey", + "Tom Tromey ", "David Trowbridge", "Jon Trowbridge", "段 活 文", @@ -605,19 +603,20 @@ "Jason van Zyl", // MATE start here "Perberos ", + "Stefano Karapetsas ", NULL }; // documentacion - /*const gchar* documenters[] = { - "TODO", // TODO: fillme + const gchar* documenters[] = { + "...", // TODO: fillme NULL - };*/ + }; // artistas - /*const gchar* artists[] = { - "TODO", // TODO: fillme + const gchar* artists[] = { + "...", // TODO: fillme NULL - };*/ + }; // widget de la unica ventana GtkWidget* mate_about_dialog = FALSE; -- cgit v1.2.1