add translation credits, gtetrinet's logo and a hyperlink to gtetrinet's homepage...

diff --git a/ChangeLog b/ChangeLog
index 993fc2472b97dec15e0df68057d169ca2623e0c3..3d38c5352ddbe282ad918a3b878d8157c27765ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-28  Jordi Mallach  <jordi@sindominio.net>
+
+       * src/commands.c (about_command): rename documentors to documenters.
+       Add translator credits. Assign the gtetrinet icon to the about dialog.
+       Add a hyperlink to GTetrinet's homepage.
+       * src/gtetrinet.c (main): set bind_textdomain_codeset to "UTF-8".
+       Remove useless setlocale call.
+
+       * configure.in: bump version to 0.5.0pre1.
+
 2002-10-28  Jordi Mallach  <jordi@sindominio.net>
 
        * Finally, GNOME2!

diff --git a/configure.in b/configure.in
index 59593773cfbc4bf6e01c8e28aff9cb0935a4b5f6..4ff0d249afb9ca7ec1cb24a92a0252316a8d14a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR([src/gtetrinet.c])
 AM_CONFIG_HEADER(config.h:config.h.in)
-AM_INIT_AUTOMAKE(gtetrinet, 0.4.4)
+AM_INIT_AUTOMAKE(gtetrinet, 0.5.0pre1)
 
 AC_PROG_CC
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 7142cd7415b54154c1b21d70c90a53e2f69a43a5..1db138210c22a33a15058f0bc71f0865b57e8567 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ localedir = $(datadir)/locale
 
 GTET_DEBUG = -Wall -W -Wno-unused -g3 -O0
 
-INCLUDES = -DLOCALEDIR=\"$(localedir)\" $(GTET_CFLAGS) $(GTET_DEBUG)
+INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPIXMAPSDIR=\""$(datadir)/pixmaps"\" $(GTET_CFLAGS) $(GTET_DEBUG)
 LDADD = $(GTET_LIBS)
 AM_CPPFLAGS = -DGTETRINET_DATA=\"$(pkgdatadir)\"
 

diff --git a/src/commands.c b/src/commands.c
index b6a2f5cda8b9d6d6b8f2c6b67787e145f203c5e3..16aed955720a092bfaef38e31c50775c18ffbd5c 100644 (file)
--- a/src/commands.c
+++ b/src/commands.c
@@ -219,21 +219,39 @@ void commands_checkstate ()
 
 void about_command (GtkWidget *widget, gpointer data)
 {
-    GtkWidget *about;
+    GtkWidget *about, *hbox;
+    GdkPixbuf *logo;
 
     const char *authors[] = {N_("Ka-shu Wong <kswong@zip.com.au>"),
                              N_("James Antill <james@and.org>"),
                              NULL};
-    const char *documentors[] = {N_("Ka-shu Wong <kswong@zip.com.au>"),
+    const char *documenters[] = {N_("Ka-shu Wong <kswong@zip.com.au>"),
                                  N_("Jordi Mallach <jordi@sindominio.net>"),
                                  NULL};
+    /* Translators: translate as your names & emails */
+    const char *translators = _("translator_credits");
+
+    logo = gdk_pixbuf_new_from_file (PIXMAPSDIR "/gtetrinet.png", NULL);
     
     about = gnome_about_new (APPNAME, APPVERSION,
                              _("(C) 1999, 2000, 2001, 2002 Ka-shu Wong"),
-                             _("A Tetrinet client for GNOME.\n"
-                               "Homepage: http://gtetrinet.sourceforge.net/\n"),
+                             _("A Tetrinet client for GNOME.\n"),
                              authors,
-                             documentors,
-                             NULL, NULL);
+                             documenters,
+                            strcmp (translators, "translator_credits") != 0 ?
+                                    translators : NULL,
+                            logo);
+
+    if (logo != NULL)
+               g_object_unref (logo);
+
+    hbox = gtk_hbox_new (TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox),
+               gnome_href_new ("http://gtetrinet.sourceforge.net/", _("GTetrinet Home Page")),
+               FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (about)->vbox),
+                       hbox, TRUE, FALSE, 0);
+    gtk_widget_show_all (hbox);
+
     gtk_widget_show (about);
 }

diff --git a/src/gtetrinet.c b/src/gtetrinet.c
index f86af93313c3645b019acf40689bf69851e949a7..88de98283d30aaff1495ab2f7c41a0d177d7f080 100644 (file)
--- a/src/gtetrinet.c
+++ b/src/gtetrinet.c
@@ -128,8 +128,8 @@ int main (int argc, char *argv[])
     g_assert(buf[1] == 'b');
     g_assert(buf[0] == 'a');
     
-    setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
+    bind_textdomain_codeset(PACKAGE, "UTF-8");
     textdomain(PACKAGE);
 
     srand (time(NULL));