Author: cazfi
Date: Mon Feb  9 06:34:05 2015
New Revision: 28050

URL: http://svn.gna.org/viewcvs/freeciv?rev=28050&view=rev
Log:
Show versions of glib built against, and one being in use in gtk-clients' 
'About Freeciv'

See patch #5790

Modified:
    branches/S2_6/client/gui-gtk-2.0/gui_main.c
    branches/S2_6/client/gui-gtk-3.0/gui_main.c

Modified: branches/S2_6/client/gui-gtk-2.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/gui_main.c?rev=28050&r1=28049&r2=28050&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-2.0/gui_main.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/gui_main.c Mon Feb  9 06:34:05 2015
@@ -2135,9 +2135,12 @@
 **************************************************************************/
 void insert_client_build_info(char *outbuf, size_t outlen)
 {
-  cat_snprintf(outbuf, outlen, _("\nBuilt against gtk+ %d.%d.%d, using 
%d.%d.%d"),
+  cat_snprintf(outbuf, outlen, _("\nBuilt against gtk+ %d.%d.%d, using 
%d.%d.%d"
+                                 "\nBuilt against glib %d.%d.%d, using 
%d.%d.%d"),
                GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
+               gtk_major_version, gtk_minor_version, gtk_micro_version,
+               GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION,
+               glib_major_version, glib_minor_version, glib_micro_version);
 }
 
 /**************************************************************************

Modified: branches/S2_6/client/gui-gtk-3.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gui_main.c?rev=28050&r1=28049&r2=28050&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/gui_main.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/gui_main.c Mon Feb  9 06:34:05 2015
@@ -2164,9 +2164,12 @@
 **************************************************************************/
 void insert_client_build_info(char *outbuf, size_t outlen)
 {
-  cat_snprintf(outbuf, outlen, _("\nBuilt against gtk+ %d.%d.%d, using 
%d.%d.%d"),
+  cat_snprintf(outbuf, outlen, _("\nBuilt against gtk+ %d.%d.%d, using 
%d.%d.%d"
+                                 "\nBuilt against glib %d.%d.%d, using 
%d.%d.%d"),
                GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
-               gtk_get_major_version(), gtk_get_minor_version(), 
gtk_get_micro_version());
+               gtk_get_major_version(), gtk_get_minor_version(), 
gtk_get_micro_version(),
+               GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION,
+               glib_major_version, glib_minor_version, glib_micro_version);
 }
 
 /**************************************************************************


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to