date:20150208

[Freeciv-commits] r28037 - in /branches/S2_6: ./ client/ client/gui-qt/ data/themes/gui-qt/icons/ dependencies/lua-5.3/ dependencies/lua-5.3/s...

2015-02-08 Thread 0jacobnk . gna

Author: jtn
Date: Sun Feb  8 10:40:49 2015
New Revision: 28037

URL: http://svn.gna.org/viewcvs/freeciv?rev=28037&view=rev
Log:
Update svn:ignore for some recent developments.

Modified:
branches/S2_6/   (props changed)
branches/S2_6/client/   (props changed)
branches/S2_6/client/gui-qt/   (props changed)
branches/S2_6/data/themes/gui-qt/icons/   (props changed)
branches/S2_6/dependencies/lua-5.3/   (props changed)
branches/S2_6/dependencies/lua-5.3/src/   (props changed)
branches/S2_6/tools/   (props changed)
branches/S2_6/tools/ruledit/   (props changed)

Propchange: branches/S2_6/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:40:49 2015
@@ -15,6 +15,7 @@
 ser
 fcgui
 fcser
+fcruledit
 .deps
 *.sav
 *.sav.gz

Propchange: branches/S2_6/client/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:40:49 2015
@@ -5,6 +5,7 @@
 freeciv-gtk2
 freeciv-gtk3
 freeciv-sdl
+freeciv-sdl2
 freeciv-qt
 freeciv-stub
 .deps

Propchange: branches/S2_6/client/gui-qt/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:40:49 2015
@@ -10,4 +10,12 @@
 meta_optiondlg.cpp
 meta_citydlg.cpp
 meta_cityrep.cpp
+meta_helpdlg.cpp
 meta_plrdlg.cpp
+meta_diplodlg.cpp
+meta_spaceshipdlg.cpp
+meta_messagewin.cpp
+meta_chatline.cpp
+meta_messagedlg.cpp
+meta_voteinfo_bar.cpp
+meta_gotodlg.cpp

Propchange: branches/S2_6/data/themes/gui-qt/icons/
--
--- svn:ignore  (added)
+++ svn:ignore  Sun Feb  8 10:40:49 2015
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

Propchange: branches/S2_6/dependencies/lua-5.3/
--
--- svn:ignore  (added)
+++ svn:ignore  Sun Feb  8 10:40:49 2015
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

Propchange: branches/S2_6/dependencies/lua-5.3/src/
--
--- svn:ignore  (added)
+++ svn:ignore  Sun Feb  8 10:40:49 2015
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+.deps

Propchange: branches/S2_6/tools/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:40:49 2015
@@ -2,6 +2,7 @@
 Makefile
 Makefile.in
 meta_mpgui_qt.cpp
+meta_mpgui_qt_worker.cpp
 freeciv-manual
 freeciv-mp-cli
 freeciv-mp-gtk2

Propchange: branches/S2_6/tools/ruledit/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:40:49 2015
@@ -1,7 +1,13 @@
 Makefile.in
 Makefile
 .deps
+meta_requirers_dlg.cpp
 meta_ruledit_qt.cpp
 meta_tab_misc.cpp
+meta_tab_nation.cpp
 meta_tab_tech.cpp
+meta_tab_building.cpp
+meta_tab_unit.cpp
 freeciv-ruledit
+freeciv-ruledit.desktop
+freeciv-ruledit.appdata.xml


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

[Freeciv-commits] r28036 - in /trunk: ./ client/ client/gui-qt/ data/themes/gui-qt/icons/ dependencies/lua-5.3/ dependencies/lua-5.3/src/ depe...

2015-02-08 Thread 0jacobnk . gna

Author: jtn
Date: Sun Feb  8 10:40:40 2015
New Revision: 28036

URL: http://svn.gna.org/viewcvs/freeciv?rev=28036&view=rev
Log:
Update svn:ignore for some recent developments.

Modified:
trunk/   (props changed)
trunk/client/   (props changed)
trunk/client/gui-qt/   (props changed)
trunk/data/themes/gui-qt/icons/   (props changed)
trunk/dependencies/lua-5.3/   (props changed)
trunk/dependencies/lua-5.3/src/   (props changed)
trunk/dependencies/tinycthread/   (props changed)
trunk/tools/   (props changed)
trunk/tools/ruledit/   (props changed)

Propchange: trunk/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:40:40 2015
@@ -15,6 +15,7 @@
 ser
 fcgui
 fcser
+fcruledit
 .deps
 *.sav
 *.sav.gz

Propchange: trunk/client/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:40:40 2015
@@ -5,6 +5,7 @@
 freeciv-gtk2
 freeciv-gtk3
 freeciv-sdl
+freeciv-sdl2
 freeciv-qt
 freeciv-stub
 .deps

Propchange: trunk/client/gui-qt/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:40:40 2015
@@ -10,4 +10,12 @@
 meta_optiondlg.cpp
 meta_citydlg.cpp
 meta_cityrep.cpp
+meta_helpdlg.cpp
 meta_plrdlg.cpp
+meta_diplodlg.cpp
+meta_spaceshipdlg.cpp
+meta_messagewin.cpp
+meta_chatline.cpp
+meta_messagedlg.cpp
+meta_voteinfo_bar.cpp
+meta_gotodlg.cpp

Propchange: trunk/data/themes/gui-qt/icons/
--
--- svn:ignore  (added)
+++ svn:ignore  Sun Feb  8 10:40:40 2015
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

Propchange: trunk/dependencies/lua-5.3/
--
--- svn:ignore  (added)
+++ svn:ignore  Sun Feb  8 10:40:40 2015
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

Propchange: trunk/dependencies/lua-5.3/src/
--
--- svn:ignore  (added)
+++ svn:ignore  Sun Feb  8 10:40:40 2015
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+.deps

Propchange: trunk/dependencies/tinycthread/
--
--- svn:ignore  (added)
+++ svn:ignore  Sun Feb  8 10:40:40 2015
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+.deps

Propchange: trunk/tools/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:40:40 2015
@@ -2,6 +2,7 @@
 Makefile
 Makefile.in
 meta_mpgui_qt.cpp
+meta_mpgui_qt_worker.cpp
 freeciv-manual
 freeciv-mp-cli
 freeciv-mp-gtk2

Propchange: trunk/tools/ruledit/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:40:40 2015
@@ -1,7 +1,13 @@
 Makefile.in
 Makefile
 .deps
+meta_requirers_dlg.cpp
 meta_ruledit_qt.cpp
 meta_tab_misc.cpp
+meta_tab_nation.cpp
 meta_tab_tech.cpp
+meta_tab_building.cpp
+meta_tab_unit.cpp
 freeciv-ruledit
+freeciv-ruledit.desktop
+freeciv-ruledit.appdata.xml


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

[Freeciv-commits] r28038 - in /branches/S2_5: client/gui-qt/ data/themes/gui-qt/icons/ tools/

2015-02-08 Thread 0jacobnk . gna

Author: jtn
Date: Sun Feb  8 10:41:02 2015
New Revision: 28038

URL: http://svn.gna.org/viewcvs/freeciv?rev=28038&view=rev
Log:
Update svn:ignore for recent Qt development.

Modified:
branches/S2_5/client/gui-qt/   (props changed)
branches/S2_5/data/themes/gui-qt/icons/   (props changed)
branches/S2_5/tools/   (props changed)

Propchange: branches/S2_5/client/gui-qt/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:41:02 2015
@@ -2,6 +2,7 @@
 Makefile
 .deps
 meta_fc_client.cpp
+meta_helpdlg.cpp
 meta_ratesdlg.cpp
 meta_mapview.cpp
 meta_menu.cpp
@@ -11,3 +12,10 @@
 meta_citydlg.cpp
 meta_cityrep.cpp
 meta_plrdlg.cpp
+meta_diplodlg.cpp
+meta_spaceshipdlg.cpp
+meta_messagewin.cpp
+meta_chatline.cpp
+meta_messagedlg.cpp
+meta_voteinfo_bar.cpp
+meta_gotodlg.cpp

Propchange: branches/S2_5/data/themes/gui-qt/icons/
--
--- svn:ignore  (added)
+++ svn:ignore  Sun Feb  8 10:41:02 2015
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

Propchange: branches/S2_5/tools/
--
--- svn:ignore  (original)
+++ svn:ignore  Sun Feb  8 10:41:02 2015
@@ -2,6 +2,7 @@
 Makefile
 Makefile.in
 meta_mpgui_qt.cpp
+meta_mpgui_qt_worker.cpp
 freeciv-manual
 freeciv-mp-cli
 freeciv-mp-gtk2


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

[Freeciv-commits] r28039 - /trunk/data/misc/editor.png

2015-02-08 Thread cazfi74

Author: cazfi
Date: Mon Feb  9 05:58:00 2015
New Revision: 28039

URL: http://svn.gna.org/viewcvs/freeciv?rev=28039&view=rev
Log:
Added proper icon for editor 'roads' tool.

Art by GriffonSpade
Requested by Jacob Nevins 

See bug #20536

Modified:
trunk/data/misc/editor.png

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/data/misc/editor.png
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/editor.png?rev=28039&r1=28038&r2=28039&view=diff


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

[Freeciv-commits] r28041 - /branches/S2_5/data/misc/editor.png

2015-02-08 Thread cazfi74

Author: cazfi
Date: Mon Feb  9 05:58:27 2015
New Revision: 28041

URL: http://svn.gna.org/viewcvs/freeciv?rev=28041&view=rev
Log:
Added proper icon for editor 'roads' tool.

Art by GriffonSpade
Requested by Jacob Nevins 

See bug #20536

Modified:
branches/S2_5/data/misc/editor.png

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_5/data/misc/editor.png
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/misc/editor.png?rev=28041&r1=28040&r2=28041&view=diff


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

[Freeciv-commits] r28040 - /branches/S2_6/data/misc/editor.png

2015-02-08 Thread cazfi74

Author: cazfi
Date: Mon Feb  9 05:58:10 2015
New Revision: 28040

URL: http://svn.gna.org/viewcvs/freeciv?rev=28040&view=rev
Log:
Added proper icon for editor 'roads' tool.

Art by GriffonSpade
Requested by Jacob Nevins 

See bug #20536

Modified:
branches/S2_6/data/misc/editor.png

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_6/data/misc/editor.png
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/misc/editor.png?rev=28040&r1=28039&r2=28040&view=diff


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

[Freeciv-commits] r28042 - /trunk/client/gui-gtk-2.0/citydlg.c

2015-02-08 Thread cazfi74

Author: cazfi
Date: Mon Feb  9 06:21:22 2015
New Revision: 28042

URL: http://svn.gna.org/viewcvs/freeciv?rev=28042&view=rev
Log:
Free gtk2-client's custom citydlg info styles when citydlg system is closed,
for example when disconnecting from server.

See bug #23234

Modified:
trunk/client/gui-gtk-2.0/citydlg.c

Modified: trunk/client/gui-gtk-2.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/citydlg.c?rev=28042&r1=28041&r2=28042&view=diff
==
--- trunk/client/gui-gtk-2.0/citydlg.c  (original)
+++ trunk/client/gui-gtk-2.0/citydlg.c  Mon Feb  9 06:21:22 2015
@@ -541,14 +541,21 @@
 */
 void popdown_all_city_dialogs(void)
 {
+  int i;
+
   if (!city_dialogs_have_been_initialised) {
 return;
   }
+
   while (dialog_list_size(dialog_list)) {
 close_city_dialog(dialog_list_get(dialog_list, 0));
   }
   dialog_list_destroy(dialog_list);
-  
+
+  for (i = 0; i < NUM_INFO_STYLES; i++) {
+g_object_unref(info_label_style[i]);
+  }
+
   city_dialogs_have_been_initialised = FALSE;
 }
 


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

[Freeciv-commits] r28043 - /branches/S2_6/client/gui-gtk-2.0/citydlg.c

2015-02-08 Thread cazfi74

Author: cazfi
Date: Mon Feb  9 06:21:29 2015
New Revision: 28043

URL: http://svn.gna.org/viewcvs/freeciv?rev=28043&view=rev
Log:
Free gtk2-client's custom citydlg info styles when citydlg system is closed,
for example when disconnecting from server.

See bug #23234

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

Modified: branches/S2_6/client/gui-gtk-2.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/citydlg.c?rev=28043&r1=28042&r2=28043&view=diff
==
--- branches/S2_6/client/gui-gtk-2.0/citydlg.c  (original)
+++ branches/S2_6/client/gui-gtk-2.0/citydlg.c  Mon Feb  9 06:21:29 2015
@@ -541,14 +541,21 @@
 */
 void popdown_all_city_dialogs(void)
 {
+  int i;
+
   if (!city_dialogs_have_been_initialised) {
 return;
   }
+
   while (dialog_list_size(dialog_list)) {
 close_city_dialog(dialog_list_get(dialog_list, 0));
   }
   dialog_list_destroy(dialog_list);
-  
+
+  for (i = 0; i < NUM_INFO_STYLES; i++) {
+g_object_unref(info_label_style[i]);
+  }
+
   city_dialogs_have_been_initialised = FALSE;
 }
 


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

[Freeciv-commits] r28044 - /branches/S2_5/client/gui-gtk-2.0/citydlg.c

2015-02-08 Thread cazfi74

Author: cazfi
Date: Mon Feb  9 06:21:36 2015
New Revision: 28044

URL: http://svn.gna.org/viewcvs/freeciv?rev=28044&view=rev
Log:
Free gtk2-client's custom citydlg info styles when citydlg system is closed,
for example when disconnecting from server.

See bug #23234

Modified:
branches/S2_5/client/gui-gtk-2.0/citydlg.c

Modified: branches/S2_5/client/gui-gtk-2.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/citydlg.c?rev=28044&r1=28043&r2=28044&view=diff
==
--- branches/S2_5/client/gui-gtk-2.0/citydlg.c  (original)
+++ branches/S2_5/client/gui-gtk-2.0/citydlg.c  Mon Feb  9 06:21:36 2015
@@ -541,14 +541,21 @@
 */
 void popdown_all_city_dialogs(void)
 {
+  int i;
+
   if (!city_dialogs_have_been_initialised) {
 return;
   }
+
   while (dialog_list_size(dialog_list)) {
 close_city_dialog(dialog_list_get(dialog_list, 0));
   }
   dialog_list_destroy(dialog_list);
-  
+
+  for (i = 0; i < NUM_INFO_STYLES; i++) {
+g_object_unref(info_label_style[i]);
+  }
+
   city_dialogs_have_been_initialised = FALSE;
 }
 


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

[Freeciv-commits] r28045 - /branches/S2_4/client/gui-gtk-2.0/citydlg.c

2015-02-08 Thread cazfi74

Author: cazfi
Date: Mon Feb  9 06:21:43 2015
New Revision: 28045

URL: http://svn.gna.org/viewcvs/freeciv?rev=28045&view=rev
Log:
Free gtk2-client's custom citydlg info styles when citydlg system is closed,
for example when disconnecting from server.

See bug #23234

Modified:
branches/S2_4/client/gui-gtk-2.0/citydlg.c

Modified: branches/S2_4/client/gui-gtk-2.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-gtk-2.0/citydlg.c?rev=28045&r1=28044&r2=28045&view=diff
==
--- branches/S2_4/client/gui-gtk-2.0/citydlg.c  (original)
+++ branches/S2_4/client/gui-gtk-2.0/citydlg.c  Mon Feb  9 06:21:43 2015
@@ -541,14 +541,21 @@
 */
 void popdown_all_city_dialogs(void)
 {
+  int i;
+
   if (!city_dialogs_have_been_initialised) {
 return;
   }
+
   while (dialog_list_size(dialog_list)) {
 close_city_dialog(dialog_list_get(dialog_list, 0));
   }
   dialog_list_destroy(dialog_list);
-  
+
+  for (i = 0; i < NUM_INFO_STYLES; i++) {
+g_object_unref(info_label_style[i]);
+  }
+
   city_dialogs_have_been_initialised = FALSE;
 }
 


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

[Freeciv-commits] r28047 - /branches/S2_6/doc/README.packaging

2015-02-08 Thread cazfi74

Author: cazfi
Date: Mon Feb  9 06:28:40 2015
New Revision: 28047

URL: http://svn.gna.org/viewcvs/freeciv?rev=28047&view=rev
Log:
Removed Xaw from the example of building multiple clients

See patch #5793

Modified:
branches/S2_6/doc/README.packaging

Modified: branches/S2_6/doc/README.packaging
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.packaging?rev=28047&r1=28046&r2=28047&view=diff
==
--- branches/S2_6/doc/README.packaging  (original)
+++ branches/S2_6/doc/README.packaging  Mon Feb  9 06:28:40 2015
@@ -129,7 +129,7 @@
 -
 Starting from 2.2 it has been possible to build multiple clients running
 'make' just once. Just give configure option "--enable-client" comma
-separated list of clients to compile, e.g. 
"--enable-client=gtk3,gtk2,sdl,xaw,qt"
+separated list of clients to compile, e.g. "--enable-client=gtk3,gtk2,sdl,qt"
 
 --
 Savegame compression support


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

[Freeciv-commits] r28048 - /branches/S2_5/doc/README.packaging

2015-02-08 Thread cazfi74

Author: cazfi
Date: Mon Feb  9 06:28:47 2015
New Revision: 28048

URL: http://svn.gna.org/viewcvs/freeciv?rev=28048&view=rev
Log:
Removed Xaw from the example of building multiple clients

See patch #5793

Modified:
branches/S2_5/doc/README.packaging

Modified: branches/S2_5/doc/README.packaging
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/README.packaging?rev=28048&r1=28047&r2=28048&view=diff
==
--- branches/S2_5/doc/README.packaging  (original)
+++ branches/S2_5/doc/README.packaging  Mon Feb  9 06:28:47 2015
@@ -134,7 +134,7 @@
 -
 Starting from 2.2 it has been possible to build multiple clients running
 'make' just once. Just give configure option "--enable-client" comma
-separated list of clients to compile, e.g. 
"--enable-client=gtk3,gtk2,sdl,xaw,qt"
+separated list of clients to compile, e.g. "--enable-client=gtk3,gtk2,sdl,qt"
 
 --
 Savegame compression support


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

[Freeciv-commits] r28046 - /trunk/doc/README.packaging

2015-02-08 Thread cazfi74

Author: cazfi
Date: Mon Feb  9 06:28:32 2015
New Revision: 28046

URL: http://svn.gna.org/viewcvs/freeciv?rev=28046&view=rev
Log:
Removed Xaw from the example of building multiple clients

See patch #5793

Modified:
trunk/doc/README.packaging

Modified: trunk/doc/README.packaging
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.packaging?rev=28046&r1=28045&r2=28046&view=diff
==
--- trunk/doc/README.packaging  (original)
+++ trunk/doc/README.packaging  Mon Feb  9 06:28:32 2015
@@ -106,7 +106,7 @@
 -
 Starting from 2.2 it has been possible to build multiple clients running
 'make' just once. Just give configure option "--enable-client" comma
-separated list of clients to compile, e.g. 
"--enable-client=gtk3,gtk2,sdl,xaw,qt"
+separated list of clients to compile, e.g. "--enable-client=gtk3,gtk2,sdl2,qt"
 
 --
 Savegame compression support


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

[Freeciv-commits] r28049 - in /trunk/client: gui-gtk-2.0/gui_main.c gui-gtk-3.0/gui_main.c

2015-02-08 Thread cazfi74

Author: cazfi
Date: Mon Feb  9 06:33:57 2015
New Revision: 28049

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

See patch #5790

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

Modified: trunk/client/gui-gtk-2.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/gui_main.c?rev=28049&r1=28048&r2=28049&view=diff
==
--- trunk/client/gui-gtk-2.0/gui_main.c (original)
+++ trunk/client/gui-gtk-2.0/gui_main.c Mon Feb  9 06:33:57 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: trunk/client/gui-gtk-3.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_main.c?rev=28049&r1=28048&r2=28049&view=diff
==
--- trunk/client/gui-gtk-3.0/gui_main.c (original)
+++ trunk/client/gui-gtk-3.0/gui_main.c Mon Feb  9 06:33:57 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

[Freeciv-commits] r28050 - in /branches/S2_6/client: gui-gtk-2.0/gui_main.c gui-gtk-3.0/gui_main.c

2015-02-08 Thread cazfi74

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

[Freeciv-commits] r28037 - in /branches/S2_6: ./ client/ client/gui-qt/ data/themes/gui-qt/icons/ dependencies/lua-5.3/ dependencies/lua-5.3/s...

[Freeciv-commits] r28036 - in /trunk: ./ client/ client/gui-qt/ data/themes/gui-qt/icons/ dependencies/lua-5.3/ dependencies/lua-5.3/src/ depe...

[Freeciv-commits] r28038 - in /branches/S2_5: client/gui-qt/ data/themes/gui-qt/icons/ tools/

[Freeciv-commits] r28039 - /trunk/data/misc/editor.png

[Freeciv-commits] r28041 - /branches/S2_5/data/misc/editor.png

[Freeciv-commits] r28040 - /branches/S2_6/data/misc/editor.png

[Freeciv-commits] r28042 - /trunk/client/gui-gtk-2.0/citydlg.c

[Freeciv-commits] r28043 - /branches/S2_6/client/gui-gtk-2.0/citydlg.c

[Freeciv-commits] r28044 - /branches/S2_5/client/gui-gtk-2.0/citydlg.c

[Freeciv-commits] r28045 - /branches/S2_4/client/gui-gtk-2.0/citydlg.c

[Freeciv-commits] r28047 - /branches/S2_6/doc/README.packaging

[Freeciv-commits] r28048 - /branches/S2_5/doc/README.packaging

[Freeciv-commits] r28046 - /trunk/doc/README.packaging

[Freeciv-commits] r28049 - in /trunk/client: gui-gtk-2.0/gui_main.c gui-gtk-3.0/gui_main.c

[Freeciv-commits] r28050 - in /branches/S2_6/client: gui-gtk-2.0/gui_main.c gui-gtk-3.0/gui_main.c

15 matches

Site Navigation

Mail list logo

Footer information