DELTA 34075 94303 26 SVN„ê„é ;‚4“u‚ƒ›“vµTó@€]Rƒ°n€^gƒ²›‰8ƒ´!‰ƒ½Z£œmƒÇƒ†ƒã{22.22 client specific options from gtk3 client options.void migrate_options_from_gtk3(void) { log_normal(_("Migrating options from gtk3 to gtk3.223_##opt; #define MIGRATE_STR_OPTION(opt) \ strncpy(GUI_GTK_OPTION(opt), gui_options.gui_gtk3MIGRATE_OPTION(fullscreen);33)) { migrate_options_from_gtk3_22ENDREP DELTA 34054 5619 248 SVN—d—m v†X€v‡E22_##optname #define GUI_GTK_OPTION_STR(optname) "gui_gtk3_22_" #optname #define GUI_GTK_DEFAULT_THEME_NAME FC_GTK3_22ENDREP id: 10k.5xd.r34080/577 type: file pred: 10k.5xd.r34075/118850 count: 379 text: 34080 0 381 78986 ee20e78ee6b611abb4873409d25bf3af props: 11057 38870 112 0 ec3aa248409009be6c82cab2c7e95ef5 cpath: /branches/S2_6/client/gui-gtk-3.22/gui_main.c copyroot: 34027 /branches/S2_6/client/gui-gtk-3.22 id: 10l.5xd.r34080/870 type: file pred: 10l.5xd.r34054/7064 count: 56 text: 34080 409 140 3053 a1e0abc35802f590231d2950bbbf2648 props: 10096 14654 111 0 1912998302effd94f7d1c131050552ad cpath: /branches/S2_6/client/gui-gtk-3.22/gui_main.h copyroot: 34027 /branches/S2_6/client/gui-gtk-3.22 PLAIN K 11 Makefile.am V 22 file zu.5xd.r34029/103 K 15 action_dialog.c V 26 file 36n.5xi.r34075/108849 K 8 canvas.c V 26 file 2y6.5xd.r34075/109156 K 8 canvas.h V 26 file 2y7.5xd.r34075/109450 K 10 chatline.c V 25 file zw.5xd.r34075/109740 K 10 chatline.h V 25 file zx.5xd.r34075/110033 K 15 choice_dialog.c V 26 file 377.5xd.r34075/110325 K 15 choice_dialog.h V 26 file 378.5xd.r34075/110624 K 14 citizensinfo.c V 26 file 6n1.5xd.r34075/110922 K 14 citizensinfo.h V 24 file 6n2.5qq.r31041/6189 K 9 citydlg.c V 25 file zy.5xd.r34075/111218 K 9 citydlg.h V 25 file zz.5xd.r34075/111509 K 9 cityrep.c V 26 file 100.5xd.r34075/111792 K 9 cityrep.h V 26 file 101.5xd.r34075/112088 K 8 cma_fe.c V 26 file 102.5xd.r34075/112380 K 8 cma_fe.h V 26 file 103.5xd.r34075/112674 K 8 colors.c V 26 file 104.5xd.r34075/112969 K 8 colors.h V 26 file 105.5xd.r34075/113260 K 12 connectdlg.c V 26 file 106.5xd.r34075/113549 K 12 connectdlg.h V 26 file 107.5xd.r34075/113845 K 9 dialogs.c V 26 file 108.5xd.r34075/114139 K 9 dialogs.h V 26 file 109.5xd.r34075/114434 K 10 diplodlg.c V 26 file 10a.5xd.r34075/114727 K 10 diplodlg.h V 26 file 10b.5xd.r34075/115020 K 9 editgui.c V 26 file 4ej.5xd.r34075/115310 K 9 editgui.h V 25 file 4ek.5qq.r32578/25898 K 10 editprop.c V 26 file 4el.5xd.r34075/115604 K 10 editprop.h V 26 file 3bj.5xg.r34075/115900 K 9 finddlg.c V 26 file 10c.5xd.r34075/116204 K 9 finddlg.h V 26 file 2d0.5xd.r34075/116501 K 10 gamedlgs.c V 26 file 10d.5xd.r34075/116790 K 10 gamedlgs.h V 27 file 197l.5xd.r34075/117089 K 9 gotodlg.c V 26 file 10e.5xd.r34075/117384 K 9 gotodlg.h V 26 file 10f.5xd.r34075/117678 K 10 graphics.c V 26 file 10g.5xd.r34075/117969 K 10 graphics.h V 26 file 10h.5xd.r34075/118260 K 12 gtkpixcomm.c V 26 file 10i.5xd.r34075/118552 K 12 gtkpixcomm.h V 23 file 10j.5qq.r32003/405 K 10 gui_main.c V 23 file 10k.5xd.r34080/577 K 10 gui_main.h V 23 file 10l.5xd.r34080/870 K 11 gui_stuff.c V 26 file 10m.5xd.r34075/119145 K 11 gui_stuff.h V 24 file 10n.5xd.r34054/7651 K 11 happiness.c V 26 file 10o.5xd.r34075/119440 K 11 happiness.h V 26 file 10p.5xd.r34075/119737 K 9 helpdlg.c V 26 file 10q.5xd.r34075/120032 K 9 helpdlg.h V 26 file 10r.5xd.r34075/120329 K 10 inputdlg.c V 26 file 10s.5xd.r34075/120620 K 10 inputdlg.h V 26 file 10t.5xd.r34075/120911 K 10 inteldlg.c V 26 file 10u.5xd.r34075/121202 K 10 inteldlg.h V 26 file 2d1.5xd.r34075/121495 K 12 luaconsole.c V 26 file 76e.5xd.r34075/121785 K 12 luaconsole.h V 25 file 76f.5g7.r26905/71334 K 9 mapctrl.c V 26 file 10v.5xd.r34075/122082 K 9 mapctrl.h V 26 file 10w.5xd.r34075/122376 K 9 mapview.c V 26 file 10x.5xd.r34075/122668 K 9 mapview.h V 26 file 10y.5xd.r34075/122961 K 6 menu.c V 26 file 10z.5xd.r34075/123253 K 6 menu.h V 26 file 110.5xd.r34075/123546 K 12 messagedlg.c V 26 file 111.5xd.r34075/123835 K 12 messagedlg.h V 26 file 2d2.5xd.r34075/124131 K 12 messagewin.c V 26 file 112.5xd.r34075/124422 K 12 messagewin.h V 26 file 113.5xd.r34075/124719 K 11 optiondlg.c V 26 file 4js.5xd.r34075/125015 K 11 optiondlg.h V 26 file 114.5xd.r34075/125308 K 7 pages.c V 26 file 2pi.5xe.r34075/125601 K 7 pages.h V 26 file 2pj.5xd.r34075/125894 K 8 plrdlg.c V 26 file 115.5xd.r34075/126186 K 8 plrdlg.h V 26 file 116.5xd.r34075/126479 K 10 ratesdlg.h V 26 file 2d3.5xd.r34075/126770 K 10 repodlgs.c V 26 file 118.5xd.r34075/127058 K 10 repodlgs.h V 26 file 119.5xd.r34075/127359 K 14 soundset_dlg.c V 26 file cku.5xd.r34075/127651 K 14 spaceshipdlg.c V 26 file 11c.5xd.r34075/127948 K 14 spaceshipdlg.h V 26 file 11d.5xd.r34075/128246 K 8 sprite.c V 26 file 2y8.5xd.r34075/128541 K 8 sprite.h V 26 file 2y9.5xd.r34075/128836 K 11 theme_dlg.c V 24 file 47d.5xd.r34054/9691 K 8 themes.c V 26 file 34x.5xd.r34075/129129 K 13 tileset_dlg.c V 26 file 45i.5xd.r34075/129422 K 14 transportdlg.c V 27 file 2gfq.5xd.r34075/129719 K 14 transportdlg.h V 26 file 2gfs.5qq.r32488/39736 K 12 unitselect.c V 26 file 6pa.5xd.r34075/129960 K 12 unitselect.h V 23 file 6pb.5qq.r33676/829 K 16 unitselunitdlg.c V 27 file 2gfq.5xh.r34075/130256 K 16 unitselunitdlg.h V 25 file 2mxt.5qq.r33920/1360 K 14 voteinfo_bar.c V 26 file 4h8.5xd.r34075/130515 K 14 voteinfo_bar.h V 26 file 4h9.5xd.r34075/130816 K 7 wldlg.c V 26 file 11e.5xd.r34075/131109 K 7 wldlg.h V 26 file 11f.5xd.r34075/131406 END ENDREP id: zs.5xd.r34080/5427 type: dir pred: zs.5xd.r34075/135967 count: 2123 text: 34080 1161 4253 0 fa55527c94f0a5b692434fa47d20d9a3 props: 11108 11912 79 0 480bb3268560e84c2d6c8376c422c65e cpath: /branches/S2_6/client/gui-gtk-3.22 copyroot: 34027 /branches/S2_6/client/gui-gtk-3.22 PLAIN K 11 Makefile.am V 22 file 5f.5qi.r31934/776 K 6 agents V 23 dir zf.5qi.r32601/94733 K 11 attribute.c V 24 file xh.5ck.r25151/59391 K 11 attribute.h V 24 file xi.5ck.r18863/23649 K 7 audio.c V 23 file 139.5qi.r34044/287 K 7 audio.h V 25 file 13a.5qi.r31664/81545 K 12 audio_none.c V 25 file 13d.5ck.r24916/15731 K 12 audio_none.h V 25 file 13e.5ck.r18863/20841 K 11 audio_sdl.c V 23 file 13f.5qi.r31870/943 K 11 audio_sdl.h V 25 file 13g.5ck.r18863/23885 K 17 chatline_common.c V 23 file 14q.5qi.r31578/629 K 17 chatline_common.h V 23 file 14r.5qi.r31578/895 K 16 citydlg_common.c V 24 file z4.5qi.r32722/54377 K 16 citydlg_common.h V 24 file z5.5qi.r32722/54646 K 13 cityrepdata.c V 22 file mb.5qi.r33313/312 K 13 cityrepdata.h V 24 file mc.5ck.r18863/19121 K 13 client_main.c V 23 file 2f.5rc.r33654/4629 K 13 client_main.h V 23 file hz.5sl.r33654/4905 K 8 climap.c V 24 file 197.5ck.r20232/3008 K 8 climap.h V 25 file 198.5qi.r30222/65356 K 9 climisc.c V 24 file d5.5qi.r33830/12951 K 9 climisc.h V 24 file i0.5qi.r32759/10343 K 8 clinet.c V 23 file hc.5qi.r33479/1971 K 8 clinet.h V 24 file i1.5ck.r18863/24866 K 15 colors_common.c V 24 file 33a.5qi.r31150/4089 K 15 colors_common.h V 24 file 33b.5qi.r31851/8115 K 19 connectdlg_common.c V 24 file 2fw.5qi.r33259/1194 K 19 connectdlg_common.h V 22 file 2fx.5qi.r31710/95 K 9 control.c V 22 file gz.5qi.r33842/179 K 9 control.h V 24 file i2.5qi.r33545/15478 K 7 dummy.c V 26 file 4f9.5ck.r26905/141682 K 12 dummycxx.cpp V 26 file 6kr.5ck.r26905/106211 K 8 editor.c V 25 file 3bg.5qi.r32639/19170 K 8 editor.h V 23 file 3bh.5qi.r32375/915 K 17 global_worklist.c V 25 file 4i6.5qi.r32722/55434 K 17 global_worklist.h V 26 file 4i7.5ck.r26905/126022 K 6 goto.c V 24 file vu.5qi.r33545/15736 K 6 goto.h V 22 file vv.5qi.r31299/756 K 11 gui-gtk-2.0 V 22 dir zs.5qi.r33913/4564 K 11 gui-gtk-3.0 V 22 dir zs.5qq.r34069/5742 K 12 gui-gtk-3.22 V 22 dir zs.5xd.r34080/5427 K 6 gui-qt V 23 dir 6ie.5qi.r34079/3863 K 7 gui-sdl V 23 dir 16t.5qi.r33879/5191 K 8 gui-sdl2 V 24 dir 16t.5r1.r33879/10542 K 8 gui-stub V 23 dir mh.5qi.r33654/31723 K 7 gui-xaw V 23 dir 9o.5qi.r33654/35572 K 14 gui_cbsetter.c V 25 file a3c.5qi.r32488/67727 K 14 gui_cbsetter.h V 25 file a3d.5qi.r32488/67993 K 15 gui_interface.c V 25 file 6jm.5u7.r33530/78916 K 15 gui_interface.h V 25 file 6jn.5u6.r33530/79196 K 10 helpdata.c V 24 file h1.5qi.r33830/37175 K 10 helpdata.h V 22 file i3.5qi.r30005/963 K 7 include V 23 dir b8.5qi.r33530/81357 K 19 luaconsole_common.c V 26 file 75z.5ck.r26905/100821 K 19 luaconsole_common.h V 26 file 760.5ck.r26905/106500 K 9 luascript V 24 dir 761.5qi.r29744/13350 K 16 mapctrl_common.c V 22 file 15m.5qi.r33550/81 K 16 mapctrl_common.h V 24 file 15n.5qi.r32344/1056 K 16 mapview_common.c V 22 file z2.5qi.r33930/167 K 16 mapview_common.h V 21 file z3.5qi.r32428/66 K 19 messagewin_common.c V 25 file 14s.5qi.r30211/72878 K 19 messagewin_common.h V 25 file 14t.5ck.r18863/21579 K 7 music.c V 25 file zmc.5qi.r30211/73150 K 7 music.h V 25 file zme.5ck.r27127/11513 K 9 options.c V 24 file dc.5qi.r34013/17961 K 9 options.h V 24 file i4.5qi.r34013/18224 K 17 overview_common.c V 24 file 2yk.5qi.r32990/1986 K 17 overview_common.h V 24 file 2yl.5qi.r29834/4937 K 10 packhand.c V 23 file n.5qi.r33252/41471 K 10 packhand.h V 24 file i5.5ck.r18863/20596 K 15 plrdlg_common.c V 24 file 14u.5qi.r28834/2098 K 15 plrdlg_common.h V 25 file 14v.5ck.r18863/21328 K 17 repodlgs_common.c V 26 file 11i.5qi.r30061/217644 K 17 repodlgs_common.h V 25 file 11j.5ck.r19589/11861 K 9 reqtree.c V 25 file 2ym.5qi.r32939/25831 K 9 reqtree.h V 24 file 2yn.5ck.r24150/6004 K 9 servers.c V 25 file 33x.5qi.r33530/81611 K 9 servers.h V 25 file 33y.5ck.r20478/36372 K 6 text.c V 26 file 2g3.5qi.r32527/218161 K 6 text.h V 24 file 2g4.5qi.r32344/1318 K 15 themes_common.c V 25 file 352.5qi.r31664/82856 K 15 themes_common.h V 25 file 353.5qi.r31664/83120 K 10 tilespec.c V 24 file hl.5qi.r34013/18482 K 10 tilespec.h V 22 file i6.5qi.r33317/886 K 19 unitselect_common.c V 26 file 76v.5qi.r30061/218439 K 19 unitselect_common.h V 26 file 76w.5ck.r26905/117548 K 14 update_queue.c V 25 file 4jw.5qi.r33576/87490 K 14 update_queue.h V 25 file 4jx.5qi.r33576/87759 K 10 voteinfo.c V 25 file 4fe.5qi.r30211/74980 K 10 voteinfo.h V 26 file 4ff.5ck.r26905/142263 K 6 zoom.c V 24 file 212g.5qi.r33336/200 K 6 zoom.h V 25 file 212i.5qi.r30914/1880 END ENDREP id: d.5qi.r34080/10089 type: dir pred: d.5qi.r34079/8500 count: 7256 text: 34080 5707 4369 0 79cc0070c414a9885a1bc3bbc3804ed5 props: 28037 12634 400 0 bbe1d6769a94f3af2a54f7dc91fc9c71 cpath: /branches/S2_6/client copyroot: 27474 /branches/S2_6 PLAIN K 9 ABOUT-NLS V 24 file fu.5ck.r27270/69307 K 7 AUTHORS V 24 file 5u.5ck.r22143/14016 K 7 COPYING V 22 file 1h.5qi.r29455/952 K 9 ChangeLog V 26 file 6l.5qi.r31298/7507168 K 7 INSTALL V 22 file 6.5qi.r31740/1317 K 11 Makefile.am V 22 file 59.5qi.r31920/516 K 4 NEWS V 24 file 6m.5ck.r25634/30702 K 6 README V 20 file 7.0.r4421/96382 K 2 ai V 21 dir 8.5qi.r34052/2983 K 10 autogen.sh V 22 file 12o.5qi.r32636/46 K 9 bootstrap V 23 dir 2p5.5qi.r32590/4079 K 6 client V 22 dir d.5qi.r34080/10089 K 6 common V 21 dir p.5qi.r34066/8097 K 12 configure.ac V 27 file 149.5qi.r33980/1775194 K 4 data V 22 dir w.5qi.r34076/30984 K 12 dependencies V 23 dir 2yu.5qi.r33405/2646 K 3 doc V 22 dir k7.5qi.r34036/3307 K 10 fc_version V 23 file 2lo.5qj.r33596/116 K 11 gen_headers V 23 dir 1hsw.5qi.r32276/968 K 3 lua V 24 dir 2c5p.5qi.r31920/4972 K 2 m4 V 23 dir 12p.5qi.r34028/3572 K 7 scripts V 23 dir 2yo.5qi.r31853/1104 K 6 server V 22 dir z.5qi.r34066/12540 K 5 tests V 22 dir 2g9.5qi.r32362/652 K 5 tools V 23 dir 4pj.5qp.r33825/2450 K 12 translations V 24 dir t0a.5qi.r34046/11586 K 7 utility V 22 dir 1c.5qi.r33993/3641 K 3 vms V 25 dir u9.5ck.r21528/1396085 K 5 win32 V 23 dir 2eu.5qi.r33962/2113 END ENDREP id: 3.5qi.r34080/11541 type: dir pred: 3.5qi.r34079/9951 count: 21131 text: 34080 10334 1194 0 1ae4cdeea4c9a18ab5ffaad236c67486 props: 28037 14463 292 0 9e1d5de0253c723466868990c52c129f cpath: /branches/S2_6 copyroot: 27474 /branches/S2_6 PLAIN K 5 S1_14 V 21 dir 3.21.r18109/18803 K 4 S2_0 V 21 dir 3.10x.r21862/4178 K 4 S2_1 V 22 dir 3.59e.r20026/11014 K 4 S2_2 V 21 dir 3.5cy.r21861/5036 K 4 S2_3 V 21 dir 3.5f2.r29458/5135 K 4 S2_4 V 23 dir 3.5ii.r32693/294508 K 4 S2_5 V 22 dir 3.5kv.r34070/10910 K 6 S2_5_3 V 23 dir 3.5ut.r31805/553797 K 4 S2_6 V 22 dir 3.5qi.r34080/11541 K 11 freeciv-web V 22 dir 3.5bl.r13594/14918 END ENDREP id: 1.0.r34080/12177 type: dir pred: 1.0.r34079/10585 count: 11856 text: 34080 11781 383 0 88197787ff0d63e159e663ff0e01176f cpath: /branches copyroot: 0 / PLAIN K 8 branches V 20 dir 1.0.r34080/12177 K 4 tags V 19 dir 2.0.r33382/6667 K 5 trunk V 21 dir 3.5ck.r34078/9790 K 7 website V 21 dir 3ge.0.r33387/2571 END ENDREP id: 0.0.r34080/12499 type: dir pred: 0.0.r34079/10907 count: 34080 text: 34080 12333 153 0 73cdc060ed61baf851a249ca3d68fc2d cpath: / copyroot: 0 / 10k.5xd.t34079-1 modify true false /branches/S2_6/client/gui-gtk-3.22/gui_main.c 10l.5xd.t34079-1 modify true false /branches/S2_6/client/gui-gtk-3.22/gui_main.h 12499 12647