summaryrefslogtreecommitdiff
path: root/packages/glib-2.0/files/visibility.patch
blob: 7cea8b037bcdd8df2fa158d6a9a3e12b22f78b5a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123

#
# Patch managed by http://www.holgerschurig.de/patcher.html
#

--- glib-2.4.6/glib/garray.h~visibility.patch
+++ glib-2.4.6/glib/garray.h
@@ -63,102 +63,102 @@
 #define g_array_insert_val(a,i,v) g_array_insert_vals (a, i, &(v), 1)
 #define g_array_index(a,t,i)      (((t*) (a)->data) [(i)])
 
-GArray* g_array_new               (gboolean          zero_terminated,
+GLIB_FUNC GArray* g_array_new               (gboolean          zero_terminated,
 				   gboolean          clear_,
-				   guint             element_size);
-GArray* g_array_sized_new         (gboolean          zero_terminated,
+				   guint             element_size);;
+GLIB_FUNC GArray* g_array_sized_new         (gboolean          zero_terminated,
 				   gboolean          clear_,
 				   guint             element_size,
-				   guint             reserved_size);
-gchar*  g_array_free              (GArray           *array,
-				   gboolean          free_segment);
-GArray* g_array_append_vals       (GArray           *array,
+				   guint             reserved_size);;
+GLIB_FUNC gchar*  g_array_free              (GArray           *array,
+				   gboolean          free_segment);;
+GLIB_FUNC GArray* g_array_append_vals       (GArray           *array,
 				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_prepend_vals      (GArray           *array,
+				   guint             len);;
+GLIB_FUNC GArray* g_array_prepend_vals      (GArray           *array,
 				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_insert_vals       (GArray           *array,
+				   guint             len);;
+GLIB_FUNC GArray* g_array_insert_vals       (GArray           *array,
 				   guint             index_,
 				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_set_size          (GArray           *array,
-				   guint             length);
-GArray* g_array_remove_index      (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_index_fast (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_range      (GArray           *array,
+				   guint             len);;
+GLIB_FUNC GArray* g_array_set_size          (GArray           *array,
+				   guint             length);;
+GLIB_FUNC GArray* g_array_remove_index      (GArray           *array,
+				   guint             index_);;
+GLIB_FUNC GArray* g_array_remove_index_fast (GArray           *array,
+				   guint             index_);;
+GLIB_FUNC GArray* g_array_remove_range      (GArray           *array,
 				   guint             index_,
-				   guint             length);
-void    g_array_sort              (GArray           *array,
-				   GCompareFunc      compare_func);
-void    g_array_sort_with_data    (GArray           *array,
+				   guint             length);;
+GLIB_FUNC void    g_array_sort              (GArray           *array,
+				   GCompareFunc      compare_func);;
+GLIB_FUNC void    g_array_sort_with_data    (GArray           *array,
 				   GCompareDataFunc  compare_func,
-				   gpointer          user_data);
+				   gpointer          user_data);;
 
 /* Resizable pointer array.  This interface is much less complicated
  * than the above.  Add appends a pointer.  Remove fills any cleared 
  * spot and shortens the array. remove_fast will again distort order.  
  */
 #define    g_ptr_array_index(array,index_) ((array)->pdata)[index_]
-GPtrArray* g_ptr_array_new                (void);
-GPtrArray* g_ptr_array_sized_new          (guint             reserved_size);
-gpointer*  g_ptr_array_free               (GPtrArray        *array,
-					   gboolean          free_seg);
-void       g_ptr_array_set_size           (GPtrArray        *array,
-					   gint              length);
-gpointer   g_ptr_array_remove_index       (GPtrArray        *array,
-					   guint             index_);
-gpointer   g_ptr_array_remove_index_fast  (GPtrArray        *array,
-					   guint             index_);
-gboolean   g_ptr_array_remove             (GPtrArray        *array,
-					   gpointer          data);
-gboolean   g_ptr_array_remove_fast        (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_remove_range       (GPtrArray        *array,
+GLIB_FUNC GPtrArray* g_ptr_array_new                (void);
+GLIB_FUNC GPtrArray* g_ptr_array_sized_new          (guint             reserved_size);
+GLIB_FUNC gpointer*  g_ptr_array_free               (GPtrArray        *array,
+					   gboolean          free_seg);;
+GLIB_FUNC void       g_ptr_array_set_size           (GPtrArray        *array,
+					   gint              length);;
+GLIB_FUNC gpointer   g_ptr_array_remove_index       (GPtrArray        *array,
+					   guint             index_);;
+GLIB_FUNC gpointer   g_ptr_array_remove_index_fast  (GPtrArray        *array,
+					   guint             index_);;
+GLIB_FUNC gboolean   g_ptr_array_remove             (GPtrArray        *array,
+					   gpointer          data);;
+GLIB_FUNC gboolean   g_ptr_array_remove_fast        (GPtrArray        *array,
+					   gpointer          data);;
+GLIB_FUNC void       g_ptr_array_remove_range       (GPtrArray        *array,
 					   guint             index_,
-					   guint             length);
-void       g_ptr_array_add                (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_sort               (GPtrArray        *array,
-					   GCompareFunc      compare_func);
-void       g_ptr_array_sort_with_data     (GPtrArray        *array,
+					   guint             length);;
+GLIB_FUNC void       g_ptr_array_add                (GPtrArray        *array,
+					   gpointer          data);;
+GLIB_FUNC void       g_ptr_array_sort               (GPtrArray        *array,
+					   GCompareFunc      compare_func);;
+GLIB_FUNC void       g_ptr_array_sort_with_data     (GPtrArray        *array,
 					   GCompareDataFunc  compare_func,
-					   gpointer          user_data);
-void       g_ptr_array_foreach            (GPtrArray        *array,
+					   gpointer          user_data);;
+GLIB_FUNC void       g_ptr_array_foreach            (GPtrArray        *array,
 					   GFunc             func,
-					   gpointer          user_data);
+					   gpointer          user_data);;
 
 
 /* Byte arrays, an array of guint8.  Implemented as a GArray,
  * but type-safe.
  */
 
-GByteArray* g_byte_array_new               (void);
-GByteArray* g_byte_array_sized_new         (guint             reserved_size);
-guint8*     g_byte_array_free              (GByteArray       *array,
-					    gboolean          free_segment);
-GByteArray* g_byte_array_append            (GByteArray       *array,
+GLIB_FUNC GByteArray* g_byte_array_new               (void);
+GLIB_FUNC GByteArray* g_byte_array_sized_new         (guint             reserved_size);
+GLIB_FUNC guint8*     g_byte_array_free              (GByteArray       *array,
+					    gboolean          free_segment);;
+GLIB_FUNC GByteArray* g_byte_array_append            (GByteArray       *array,
 					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_prepend           (GByteArray       *array,
+					    guint             len);;
+GLIB_FUNC GByteArray* g_byte_array_prepend           (GByteArray       *array,
 					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_set_size          (GByteArray       *array,
-					    guint             length);
-GByteArray* g_byte_array_remove_index      (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_index_fast (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_range      (GByteArray       *array,
+					    guint             len);;
+GLIB_FUNC GByteArray* g_byte_array_set_size          (GByteArray       *array,
+					    guint             length);;
+GLIB_FUNC GByteArray* g_byte_array_remove_index      (GByteArray       *array,
+					    guint             index_);;
+GLIB_FUNC GByteArray* g_byte_array_remove_index_fast (GByteArray       *array,
+					    guint             index_);;
+GLIB_FUNC GByteArray* g_byte_array_remove_range      (GByteArray       *array,
 					    guint             index_,
-					    guint             length);
-void        g_byte_array_sort              (GByteArray       *array,
-					    GCompareFunc      compare_func);
-void        g_byte_array_sort_with_data    (GByteArray       *array,
+					    guint             length);;
+GLIB_FUNC void        g_byte_array_sort              (GByteArray       *array,
+					    GCompareFunc      compare_func);;
+GLIB_FUNC void        g_byte_array_sort_with_data    (GByteArray       *array,
 					    GCompareDataFunc  compare_func,
-					    gpointer          user_data);
+					    gpointer          user_data);;
 
 
 G_END_DECLS
--- glib-2.4.6/glib/gasyncqueue.h~visibility.patch
+++ glib-2.4.6/glib/gasyncqueue.h
@@ -37,45 +37,45 @@
  */
 
 /* Get a new GAsyncQueue with the ref_count 1 */
-GAsyncQueue*  g_async_queue_new                (void);
+GLIB_FUNC GAsyncQueue*  g_async_queue_new                (void);
 
 /* Lock and unlock a GAsyncQueue. All functions lock the queue for
  * themselves, but in certain cirumstances you want to hold the lock longer,
  * thus you lock the queue, call the *_unlocked functions and unlock it again.
  */
-void          g_async_queue_lock               (GAsyncQueue *queue);
-void          g_async_queue_unlock             (GAsyncQueue *queue);
+GLIB_FUNC void          g_async_queue_lock               (GAsyncQueue *queue);
+GLIB_FUNC void          g_async_queue_unlock             (GAsyncQueue *queue);
 
 /* Ref and unref the GAsyncQueue. */
-void          g_async_queue_ref                (GAsyncQueue *queue);
-void          g_async_queue_unref              (GAsyncQueue *queue);
+GLIB_FUNC void          g_async_queue_ref                (GAsyncQueue *queue);
+GLIB_FUNC void          g_async_queue_unref              (GAsyncQueue *queue);
 #ifndef G_DISABLE_DEPRECATED
 /* You don't have to hold the lock for calling *_ref and *_unref anymore. */
-void          g_async_queue_ref_unlocked       (GAsyncQueue *queue);
-void          g_async_queue_unref_and_unlock   (GAsyncQueue *queue);
+GLIB_FUNC void          g_async_queue_ref_unlocked       (GAsyncQueue *queue);
+GLIB_FUNC void          g_async_queue_unref_and_unlock   (GAsyncQueue *queue);
 #endif /* !G_DISABLE_DEPRECATED */
 
 /* Push data into the async queue. Must not be NULL. */
-void          g_async_queue_push               (GAsyncQueue *queue,
-                                                gpointer     data);
-void          g_async_queue_push_unlocked      (GAsyncQueue *queue,
-                                                gpointer     data);
+GLIB_FUNC void          g_async_queue_push               (GAsyncQueue *queue,
+                                                gpointer     data);;
+GLIB_FUNC void          g_async_queue_push_unlocked      (GAsyncQueue *queue,
+                                                gpointer     data);;
 
 /* Pop data from the async queue. When no data is there, the thread is blocked
  * until data arrives. */
-gpointer      g_async_queue_pop                (GAsyncQueue *queue);
-gpointer      g_async_queue_pop_unlocked       (GAsyncQueue *queue);
+GLIB_FUNC gpointer      g_async_queue_pop                (GAsyncQueue *queue);
+GLIB_FUNC gpointer      g_async_queue_pop_unlocked       (GAsyncQueue *queue);
 
 /* Try to pop data. NULL is returned in case of empty queue. */
-gpointer      g_async_queue_try_pop            (GAsyncQueue *queue);
-gpointer      g_async_queue_try_pop_unlocked   (GAsyncQueue *queue);
+GLIB_FUNC gpointer      g_async_queue_try_pop            (GAsyncQueue *queue);
+GLIB_FUNC gpointer      g_async_queue_try_pop_unlocked   (GAsyncQueue *queue);
 
 /* Wait for data until at maximum until end_time is reached. NULL is returned
  * in case of empty queue. */
-gpointer      g_async_queue_timed_pop          (GAsyncQueue *queue,
-                                                GTimeVal    *end_time);
-gpointer      g_async_queue_timed_pop_unlocked (GAsyncQueue *queue,
-                                                GTimeVal    *end_time);
+GLIB_FUNC gpointer      g_async_queue_timed_pop          (GAsyncQueue *queue,
+                                                GTimeVal    *end_time);;
+GLIB_FUNC gpointer      g_async_queue_timed_pop_unlocked (GAsyncQueue *queue,
+                                                GTimeVal    *end_time);;
 
 /* Return the length of the queue. Negative values mean that threads
  * are waiting, positve values mean that there are entries in the
@@ -83,8 +83,8 @@
  * the number of waiting threads, g_async_queue_length == 0 could also
  * mean 'n' entries in the queue and 'n' thread waiting. Such can
  * happen due to locking of the queue or due to scheduling. */
-gint          g_async_queue_length             (GAsyncQueue *queue);
-gint          g_async_queue_length_unlocked    (GAsyncQueue *queue);
+GLIB_FUNC gint          g_async_queue_length             (GAsyncQueue *queue);
+GLIB_FUNC gint          g_async_queue_length_unlocked    (GAsyncQueue *queue);
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gatomic.h~visibility.patch
+++ glib-2.4.6/glib/gatomic.h
@@ -34,20 +34,20 @@
 
 G_BEGIN_DECLS
  
-gint     g_atomic_int_exchange_and_add         (gint     *atomic, 
-						gint      val);
-void     g_atomic_int_add                      (gint     *atomic, 
-						gint      val);
-gboolean g_atomic_int_compare_and_exchange     (gint     *atomic, 
+GLIB_FUNC gint     g_atomic_int_exchange_and_add         (gint     *atomic, 
+						gint      val);;
+GLIB_FUNC void     g_atomic_int_add                      (gint     *atomic, 
+						gint      val);;
+GLIB_FUNC gboolean g_atomic_int_compare_and_exchange     (gint     *atomic, 
 						gint      oldval, 
-						gint      newval);
-gboolean g_atomic_pointer_compare_and_exchange (gpointer *atomic, 
+						gint      newval);;
+GLIB_FUNC gboolean g_atomic_pointer_compare_and_exchange (gpointer *atomic, 
 						gpointer  oldval, 
-						gpointer  newval);
+						gpointer  newval);;
 
 #ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
-gint     g_atomic_int_get                      (gint     *atomic);
-gpointer g_atomic_pointer_get                  (gpointer *atomic);
+GLIB_FUNC gint     g_atomic_int_get                      (gint     *atomic);
+GLIB_FUNC gpointer g_atomic_pointer_get                  (gpointer *atomic);
 #else /* !G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
 # define g_atomic_int_get(atomic) (*(atomic))
 # define g_atomic_pointer_get(atomic) (*(atomic))
--- glib-2.4.6/glib/gbacktrace.h~visibility.patch
+++ glib-2.4.6/glib/gbacktrace.h
@@ -40,8 +40,8 @@
  * The prg_name arg is required by gdb to find the executable, if it is
  * passed as NULL, g_on_error_query() will try g_get_prgname().
  */
-void g_on_error_query (const gchar *prg_name);
-void g_on_error_stack_trace (const gchar *prg_name);
+GLIB_FUNC void g_on_error_query (const gchar *prg_name);
+GLIB_FUNC void g_on_error_stack_trace (const gchar *prg_name);
 
 /* Hacker macro to place breakpoints for selected machines.
  * Actual use is strongly discouraged of course ;)
--- glib-2.4.6/glib/gcache.h~visibility.patch
+++ glib-2.4.6/glib/gcache.h
@@ -39,24 +39,24 @@
 
 /* Caches
  */
-GCache*  g_cache_new           (GCacheNewFunc      value_new_func,
+GLIB_FUNC GCache*  g_cache_new           (GCacheNewFunc      value_new_func,
                                 GCacheDestroyFunc  value_destroy_func,
                                 GCacheDupFunc      key_dup_func,
                                 GCacheDestroyFunc  key_destroy_func,
                                 GHashFunc          hash_key_func,
                                 GHashFunc          hash_value_func,
-                                GEqualFunc         key_equal_func);
-void     g_cache_destroy       (GCache            *cache);
-gpointer g_cache_insert        (GCache            *cache,
-                                gpointer           key);
-void     g_cache_remove        (GCache            *cache,
-                                gconstpointer      value);
-void     g_cache_key_foreach   (GCache            *cache,
+                                GEqualFunc         key_equal_func);;
+GLIB_FUNC void     g_cache_destroy       (GCache            *cache);
+GLIB_FUNC gpointer g_cache_insert        (GCache            *cache,
+                                gpointer           key);;
+GLIB_FUNC void     g_cache_remove        (GCache            *cache,
+                                gconstpointer      value);;
+GLIB_FUNC void     g_cache_key_foreach   (GCache            *cache,
                                 GHFunc             func,
-                                gpointer           user_data);
-void     g_cache_value_foreach (GCache            *cache,
+                                gpointer           user_data);;
+GLIB_FUNC void     g_cache_value_foreach (GCache            *cache,
                                 GHFunc             func,
-                                gpointer           user_data);
+                                gpointer           user_data);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gcompletion.h~visibility.patch
+++ glib-2.4.6/glib/gcompletion.h
@@ -52,21 +52,21 @@
   GCompletionStrncmpFunc strncmp_func;
 };
 
-GCompletion* g_completion_new           (GCompletionFunc func);
-void         g_completion_add_items     (GCompletion*    cmp,
-                                         GList*          items);
-void         g_completion_remove_items  (GCompletion*    cmp,
-                                         GList*          items);
-void         g_completion_clear_items   (GCompletion*    cmp);
-GList*       g_completion_complete      (GCompletion*    cmp,
+GLIB_FUNC GCompletion* g_completion_new           (GCompletionFunc func);
+GLIB_FUNC void         g_completion_add_items     (GCompletion*    cmp,
+                                         GList*          items);;
+GLIB_FUNC void         g_completion_remove_items  (GCompletion*    cmp,
+                                         GList*          items);;
+GLIB_FUNC void         g_completion_clear_items   (GCompletion*    cmp);
+GLIB_FUNC GList*       g_completion_complete      (GCompletion*    cmp,
                                          const gchar*    prefix,
-                                         gchar**         new_prefix);
-GList*       g_completion_complete_utf8 (GCompletion  *cmp,
+                                         gchar**         new_prefix);;
+GLIB_FUNC GList*       g_completion_complete_utf8 (GCompletion  *cmp,
                                          const gchar*    prefix,
-                                         gchar**         new_prefix);
-void         g_completion_set_compare   (GCompletion *cmp,
-				         GCompletionStrncmpFunc strncmp_func);
-void         g_completion_free          (GCompletion*    cmp);
+                                         gchar**         new_prefix);;
+GLIB_FUNC void         g_completion_set_compare   (GCompletion *cmp,
+				         GCompletionStrncmpFunc strncmp_func);;
+GLIB_FUNC void         g_completion_free          (GCompletion*    cmp);
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gconvert.h~visibility.patch
+++ glib-2.4.6/glib/gconvert.h
@@ -43,79 +43,79 @@
 } GConvertError;
 
 #define G_CONVERT_ERROR g_convert_error_quark()
-GQuark g_convert_error_quark (void);
+GLIB_FUNC GQuark g_convert_error_quark (void);
 
 /* Thin wrappers around iconv
  */
 typedef struct _GIConv *GIConv;
 
-GIConv g_iconv_open   (const gchar  *to_codeset,
-		       const gchar  *from_codeset);
-size_t g_iconv        (GIConv        converter,
+GLIB_FUNC GIConv g_iconv_open   (const gchar  *to_codeset,
+		       const gchar  *from_codeset);;
+GLIB_FUNC size_t g_iconv        (GIConv        converter,
 		       gchar       **inbuf,
 		       gsize        *inbytes_left,
 		       gchar       **outbuf,
-		       gsize        *outbytes_left);
-gint   g_iconv_close  (GIConv        converter);
+		       gsize        *outbytes_left);;
+GLIB_FUNC gint   g_iconv_close  (GIConv        converter);
 
 
-gchar* g_convert               (const gchar  *str,
+GLIB_FUNC gchar* g_convert               (const gchar  *str,
 				gssize        len,            
 				const gchar  *to_codeset,
 				const gchar  *from_codeset,
 				gsize        *bytes_read,     
 				gsize        *bytes_written,  
-				GError      **error);
-gchar* g_convert_with_iconv    (const gchar  *str,
+				GError      **error);;
+GLIB_FUNC gchar* g_convert_with_iconv    (const gchar  *str,
 				gssize        len,
 				GIConv        converter,
 				gsize        *bytes_read,     
 				gsize        *bytes_written,  
-				GError      **error);
-gchar* g_convert_with_fallback (const gchar  *str,
+				GError      **error);;
+GLIB_FUNC gchar* g_convert_with_fallback (const gchar  *str,
 				gssize        len,            
 				const gchar  *to_codeset,
 				const gchar  *from_codeset,
 				gchar        *fallback,
 				gsize        *bytes_read,     
 				gsize        *bytes_written,  
-				GError      **error);
+				GError      **error);;
 
 
 /* Convert between libc's idea of strings and UTF-8.
  */
-gchar* g_locale_to_utf8   (const gchar  *opsysstring,
+GLIB_FUNC gchar* g_locale_to_utf8   (const gchar  *opsysstring,
 			   gssize        len,            
 			   gsize        *bytes_read,     
 			   gsize        *bytes_written,  
-			   GError      **error);
-gchar* g_locale_from_utf8 (const gchar  *utf8string,
+			   GError      **error);;
+GLIB_FUNC gchar* g_locale_from_utf8 (const gchar  *utf8string,
 			   gssize        len,            
 			   gsize        *bytes_read,     
 			   gsize        *bytes_written,  
-			   GError      **error);
+			   GError      **error);;
 
 /* Convert between the operating system (or C runtime)
  * representation of file names and UTF-8.
  */
-gchar* g_filename_to_utf8   (const gchar  *opsysstring,
+GLIB_FUNC gchar* g_filename_to_utf8   (const gchar  *opsysstring,
 			     gssize        len,            
 			     gsize        *bytes_read,     
 			     gsize        *bytes_written,  
-			     GError      **error);
-gchar* g_filename_from_utf8 (const gchar  *utf8string,
+			     GError      **error);;
+GLIB_FUNC gchar* g_filename_from_utf8 (const gchar  *utf8string,
 			     gssize        len,            
 			     gsize        *bytes_read,     
 			     gsize        *bytes_written,  
-			     GError      **error);
+			     GError      **error);;
 
-gchar *g_filename_from_uri (const gchar *uri,
+GLIB_FUNC gchar *g_filename_from_uri (const gchar *uri,
 			    gchar      **hostname,
-			    GError     **error);
+			    GError     **error);;
   
-gchar *g_filename_to_uri   (const gchar *filename,
+GLIB_FUNC gchar *g_filename_to_uri   (const gchar *filename,
 			    const gchar *hostname,
-			    GError     **error);
+			    GError     **error);;
 
 
 G_END_DECLS
--- glib-2.4.6/glib/gdataset.h~visibility.patch
+++ glib-2.4.6/glib/gdataset.h
@@ -39,19 +39,19 @@
 
 /* Keyed Data List
  */
-void      g_datalist_init                (GData          **datalist);
-void      g_datalist_clear               (GData          **datalist);
-gpointer  g_datalist_id_get_data         (GData          **datalist,
-                                          GQuark           key_id);
-void      g_datalist_id_set_data_full    (GData          **datalist,
+GLIB_FUNC void      g_datalist_init                (GData          **datalist);
+GLIB_FUNC void      g_datalist_clear               (GData          **datalist);
+GLIB_FUNC gpointer  g_datalist_id_get_data         (GData          **datalist,
+                                          GQuark           key_id);;
+GLIB_FUNC void      g_datalist_id_set_data_full    (GData          **datalist,
                                           GQuark           key_id,
                                           gpointer         data,
-                                          GDestroyNotify   destroy_func);
-gpointer  g_datalist_id_remove_no_notify (GData          **datalist,
-                                          GQuark           key_id);
-void      g_datalist_foreach             (GData          **datalist,
+                                          GDestroyNotify   destroy_func);;
+GLIB_FUNC gpointer  g_datalist_id_remove_no_notify (GData          **datalist,
+                                          GQuark           key_id);;
+GLIB_FUNC void      g_datalist_foreach             (GData          **datalist,
                                           GDataForeachFunc func,
-                                          gpointer         user_data);
+                                          gpointer         user_data);;
 #define   g_datalist_id_set_data(dl, q, d)      \
      g_datalist_id_set_data_full ((dl), (q), (d), NULL)
 #define   g_datalist_id_remove_data(dl, q)      \
@@ -70,18 +70,18 @@
 
 /* Location Associated Keyed Data
  */
-void      g_dataset_destroy             (gconstpointer    dataset_location);
-gpointer  g_dataset_id_get_data         (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-void      g_dataset_id_set_data_full    (gconstpointer    dataset_location,
+GLIB_FUNC void      g_dataset_destroy             (gconstpointer    dataset_location);
+GLIB_FUNC gpointer  g_dataset_id_get_data         (gconstpointer    dataset_location,
+                                         GQuark           key_id);;
+GLIB_FUNC void      g_dataset_id_set_data_full    (gconstpointer    dataset_location,
                                          GQuark           key_id,
                                          gpointer         data,
-                                         GDestroyNotify   destroy_func);
-gpointer  g_dataset_id_remove_no_notify (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-void      g_dataset_foreach             (gconstpointer    dataset_location,
+                                         GDestroyNotify   destroy_func);;
+GLIB_FUNC gpointer  g_dataset_id_remove_no_notify (gconstpointer    dataset_location,
+                                         GQuark           key_id);;
+GLIB_FUNC void      g_dataset_foreach             (gconstpointer    dataset_location,
                                          GDataForeachFunc func,
-                                         gpointer         user_data);
+                                         gpointer         user_data);;
 #define   g_dataset_id_set_data(l, k, d)        \
      g_dataset_id_set_data_full ((l), (k), (d), NULL)
 #define   g_dataset_id_remove_data(l, k)        \
--- glib-2.4.6/glib/gdate.h~visibility.patch
+++ glib-2.4.6/glib/gdate.h
@@ -114,121 +114,121 @@
  * to get a usable object. You can also allocate a GDate statically,
  * then call g_date_clear() to initialize.
  */
-GDate*       g_date_new                   (void);
-GDate*       g_date_new_dmy               (GDateDay     day,
+GLIB_FUNC GDate*       g_date_new                   (void);
+GLIB_FUNC GDate*       g_date_new_dmy               (GDateDay     day,
                                            GDateMonth   month,
-                                           GDateYear    year);
-GDate*       g_date_new_julian            (guint32      julian_day);
-void         g_date_free                  (GDate       *date);
+                                           GDateYear    year);;
+GLIB_FUNC GDate*       g_date_new_julian            (guint32      julian_day);
+GLIB_FUNC void         g_date_free                  (GDate       *date);
 
 /* check g_date_valid() after doing an operation that might fail, like
  * _parse.  Almost all g_date operations are undefined on invalid
  * dates (the exceptions are the mutators, since you need those to
  * return to validity).
  */
-gboolean     g_date_valid                 (const GDate *date);
-gboolean     g_date_valid_day             (GDateDay     day) G_GNUC_CONST;
-gboolean     g_date_valid_month           (GDateMonth month) G_GNUC_CONST;
-gboolean     g_date_valid_year            (GDateYear  year) G_GNUC_CONST;
-gboolean     g_date_valid_weekday         (GDateWeekday weekday) G_GNUC_CONST;
-gboolean     g_date_valid_julian          (guint32 julian_date) G_GNUC_CONST;
-gboolean     g_date_valid_dmy             (GDateDay     day,
+GLIB_FUNC gboolean     g_date_valid                 (const GDate *date);
+GLIB_FUNC gboolean     g_date_valid_day             (GDateDay     day) G_GNUC_CONST;;
+GLIB_FUNC gboolean     g_date_valid_month           (GDateMonth month) G_GNUC_CONST;;
+GLIB_FUNC gboolean     g_date_valid_year            (GDateYear  year) G_GNUC_CONST;;
+GLIB_FUNC gboolean     g_date_valid_weekday         (GDateWeekday weekday) G_GNUC_CONST;;
+GLIB_FUNC gboolean     g_date_valid_julian          (guint32 julian_date) G_GNUC_CONST;;
+GLIB_FUNC gboolean     g_date_valid_dmy             (GDateDay     day,
                                            GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
+                                           GDateYear    year) G_GNUC_CONST;;
 
-GDateWeekday g_date_get_weekday           (const GDate *date);
-GDateMonth   g_date_get_month             (const GDate *date);
-GDateYear    g_date_get_year              (const GDate *date);
-GDateDay     g_date_get_day               (const GDate *date);
-guint32      g_date_get_julian            (const GDate *date);
-guint        g_date_get_day_of_year       (const GDate *date);
+GLIB_FUNC GDateWeekday g_date_get_weekday           (const GDate *date);
+GLIB_FUNC GDateMonth   g_date_get_month             (const GDate *date);
+GLIB_FUNC GDateYear    g_date_get_year              (const GDate *date);
+GLIB_FUNC GDateDay     g_date_get_day               (const GDate *date);
+GLIB_FUNC guint32      g_date_get_julian            (const GDate *date);
+GLIB_FUNC guint        g_date_get_day_of_year       (const GDate *date);
 /* First monday/sunday is the start of week 1; if we haven't reached
  * that day, return 0. These are not ISO weeks of the year; that
  * routine needs to be added.
  * these functions return the number of weeks, starting on the
  * corrsponding day
  */
-guint        g_date_get_monday_week_of_year (const GDate *date);
-guint        g_date_get_sunday_week_of_year (const GDate *date);
+GLIB_FUNC guint        g_date_get_monday_week_of_year (const GDate *date);
+GLIB_FUNC guint        g_date_get_sunday_week_of_year (const GDate *date);
 
 /* If you create a static date struct you need to clear it to get it
  * in a sane state before use. You can clear a whole array at
  * once with the ndates argument.
  */
-void         g_date_clear                 (GDate       *date,
-                                           guint        n_dates);
+GLIB_FUNC void         g_date_clear                 (GDate       *date,
+                                           guint        n_dates);;
 
 /* The parse routine is meant for dates typed in by a user, so it
  * permits many formats but tries to catch common typos. If your data
  * needs to be strictly validated, it is not an appropriate function.
  */
-void         g_date_set_parse             (GDate       *date,
-                                           const gchar *str);
-void         g_date_set_time              (GDate       *date,
-                                           GTime        time_);
-void         g_date_set_month             (GDate       *date,
-                                           GDateMonth   month);
-void         g_date_set_day               (GDate       *date,
-                                           GDateDay     day);
-void         g_date_set_year              (GDate       *date,
-                                           GDateYear    year);
-void         g_date_set_dmy               (GDate       *date,
+GLIB_FUNC void         g_date_set_parse             (GDate       *date,
+                                           const gchar *str);;
+GLIB_FUNC void         g_date_set_time              (GDate       *date,
+                                           GTime        time_);;
+GLIB_FUNC void         g_date_set_month             (GDate       *date,
+                                           GDateMonth   month);;
+GLIB_FUNC void         g_date_set_day               (GDate       *date,
+                                           GDateDay     day);;
+GLIB_FUNC void         g_date_set_year              (GDate       *date,
+                                           GDateYear    year);;
+GLIB_FUNC void         g_date_set_dmy               (GDate       *date,
                                            GDateDay     day,
                                            GDateMonth   month,
-                                           GDateYear    y);
-void         g_date_set_julian            (GDate       *date,
-                                           guint32      julian_date);
-gboolean     g_date_is_first_of_month     (const GDate *date);
-gboolean     g_date_is_last_of_month      (const GDate *date);
+                                           GDateYear    y);;
+GLIB_FUNC void         g_date_set_julian            (GDate       *date,
+                                           guint32      julian_date);;
+GLIB_FUNC gboolean     g_date_is_first_of_month     (const GDate *date);
+GLIB_FUNC gboolean     g_date_is_last_of_month      (const GDate *date);
 
 /* To go forward by some number of weeks just go forward weeks*7 days */
-void         g_date_add_days              (GDate       *date,
-                                           guint        n_days);
-void         g_date_subtract_days         (GDate       *date,
-                                           guint        n_days);
+GLIB_FUNC void         g_date_add_days              (GDate       *date,
+                                           guint        n_days);;
+GLIB_FUNC void         g_date_subtract_days         (GDate       *date,
+                                           guint        n_days);;
 
 /* If you add/sub months while day > 28, the day might change */
-void         g_date_add_months            (GDate       *date,
-                                           guint        n_months);
-void         g_date_subtract_months       (GDate       *date,
-                                           guint        n_months);
+GLIB_FUNC void         g_date_add_months            (GDate       *date,
+                                           guint        n_months);;
+GLIB_FUNC void         g_date_subtract_months       (GDate       *date,
+                                           guint        n_months);;
 
 /* If it's feb 29, changing years can move you to the 28th */
-void         g_date_add_years             (GDate       *date,
-                                           guint        n_years);
-void         g_date_subtract_years        (GDate       *date,
-                                           guint        n_years);
-gboolean     g_date_is_leap_year          (GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_days_in_month     (GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_monday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_sunday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
+GLIB_FUNC void         g_date_add_years             (GDate       *date,
+                                           guint        n_years);;
+GLIB_FUNC void         g_date_subtract_years        (GDate       *date,
+                                           guint        n_years);;
+GLIB_FUNC gboolean     g_date_is_leap_year          (GDateYear    year) G_GNUC_CONST;;
+GLIB_FUNC guint8       g_date_get_days_in_month     (GDateMonth   month,
+                                           GDateYear    year) G_GNUC_CONST;;
+GLIB_FUNC guint8       g_date_get_monday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;;
+GLIB_FUNC guint8       g_date_get_sunday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;;
 
 /* Returns the number of days between the two dates.  If date2 comes
    before date1, a negative value is return. */
-gint         g_date_days_between          (const GDate *date1,
-					   const GDate *date2);
+GLIB_FUNC gint         g_date_days_between          (const GDate *date1,
+					   const GDate *date2);;
 
 /* qsort-friendly (with a cast...) */
-gint         g_date_compare               (const GDate *lhs,
-                                           const GDate *rhs);
-void         g_date_to_struct_tm          (const GDate *date,
-                                           struct tm   *tm);
+GLIB_FUNC gint         g_date_compare               (const GDate *lhs,
+                                           const GDate *rhs);;
+GLIB_FUNC void         g_date_to_struct_tm          (const GDate *date,
+                                           struct tm   *tm);;
 
-void         g_date_clamp                 (GDate *date,
+GLIB_FUNC void         g_date_clamp                 (GDate *date,
 					   const GDate *min_date,
-					   const GDate *max_date);
+					   const GDate *max_date);;
 
 /* Swap date1 and date2's values if date1 > date2. */
-void         g_date_order                 (GDate *date1, GDate *date2);
+GLIB_FUNC void         g_date_order                 (GDate *date1, GDate *date2);
 
 /* Just like strftime() except you can only use date-related formats.
  *   Using a time format is undefined.
  */
-gsize        g_date_strftime              (gchar       *s,
+GLIB_FUNC gsize        g_date_strftime              (gchar       *s,
                                            gsize        slen,
                                            const gchar *format,
-                                           const GDate *date);
+                                           const GDate *date);;
 
 #ifndef G_DISABLE_DEPRECATED
 
--- glib-2.4.6/glib/gdir.h~visibility.patch
+++ glib-2.4.6/glib/gdir.h
@@ -29,12 +29,12 @@
 
 typedef struct _GDir GDir;
 
-GDir    *               g_dir_open      (const gchar  *path,
+GLIB_FUNC GDir    *               g_dir_open      (const gchar  *path,
 					 guint         flags,
-					 GError      **error);
-G_CONST_RETURN gchar   *g_dir_read_name (GDir         *dir);
-void                    g_dir_rewind    (GDir         *dir);
-void                    g_dir_close     (GDir         *dir);
+					 GError      **error);;
+GLIB_FUNC G_CONST_RETURN gchar   *g_dir_read_name (GDir         *dir);
+GLIB_FUNC void                    g_dir_rewind    (GDir         *dir);
+GLIB_FUNC void                    g_dir_close     (GDir         *dir);
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gerror.h~visibility.patch
+++ glib-2.4.6/glib/gerror.h
@@ -34,38 +34,38 @@
   gchar       *message;
 };
 
-GError*  g_error_new           (GQuark         domain,
+GLIB_FUNC GError*  g_error_new           (GQuark         domain,
                                 gint           code,
                                 const gchar   *format,
-                                ...) G_GNUC_PRINTF (3, 4);
+                                ...) G_GNUC_PRINTF (3, 4);;
 
-GError*  g_error_new_literal   (GQuark         domain,
+GLIB_FUNC GError*  g_error_new_literal   (GQuark         domain,
                                 gint           code,
-                                const gchar   *message);
+                                const gchar   *message);;
 
-void     g_error_free          (GError        *error);
-GError*  g_error_copy          (const GError  *error);
+GLIB_FUNC void     g_error_free          (GError        *error);
+GLIB_FUNC GError*  g_error_copy          (const GError  *error);
 
-gboolean g_error_matches       (const GError  *error,
+GLIB_FUNC gboolean g_error_matches       (const GError  *error,
                                 GQuark         domain,
-                                gint           code);
+                                gint           code);;
 
 /* if (err) *err = g_error_new(domain, code, format, ...), also has
  * some sanity checks.
  */
-void     g_set_error           (GError       **err,
+GLIB_FUNC void     g_set_error           (GError       **err,
                                 GQuark         domain,
                                 gint           code,
                                 const gchar   *format,
-                                ...) G_GNUC_PRINTF (4, 5);
+                                ...) G_GNUC_PRINTF (4, 5);;
 
 /* if (dest) *dest = src; also has some sanity checks.
  */
-void     g_propagate_error     (GError       **dest,
-				GError        *src);
+GLIB_FUNC void     g_propagate_error     (GError       **dest,
+				GError        *src);;
 
 /* if (err && *err) { g_error_free(*err); *err = NULL; } */
-void     g_clear_error         (GError       **err);
+GLIB_FUNC void     g_clear_error         (GError       **err);
 
 
 G_END_DECLS
--- glib-2.4.6/glib/gfileutils.h~visibility.patch
+++ glib-2.4.6/glib/gfileutils.h
@@ -68,32 +68,32 @@
   G_FILE_TEST_EXISTS        = 1 << 4
 } GFileTest;
 
-GQuark     g_file_error_quark      (void);
+GLIB_FUNC GQuark     g_file_error_quark      (void);
 /* So other code can generate a GFileError */
-GFileError g_file_error_from_errno (gint err_no);
+GLIB_FUNC GFileError g_file_error_from_errno (gint err_no);
 
-gboolean g_file_test         (const gchar  *filename,
-                              GFileTest     test);
-gboolean g_file_get_contents (const gchar  *filename,
+GLIB_FUNC gboolean g_file_test         (const gchar  *filename,
+                              GFileTest     test);;
+GLIB_FUNC gboolean g_file_get_contents (const gchar  *filename,
                               gchar       **contents,
                               gsize        *length,    
-                              GError      **error);
-gchar   *g_file_read_link    (const gchar  *filename,
-			      GError      **error);
+                              GError      **error);;
+GLIB_FUNC gchar   *g_file_read_link    (const gchar  *filename,
+			      GError      **error);;
 
 /* Wrapper / workalike for mkstemp() */
-gint    g_mkstemp            (gchar        *tmpl);
+GLIB_FUNC gint    g_mkstemp            (gchar        *tmpl);
 
 /* Wrapper for g_mkstemp */
-gint    g_file_open_tmp      (const gchar  *tmpl,
+GLIB_FUNC gint    g_file_open_tmp      (const gchar  *tmpl,
 			      gchar       **name_used,
-			      GError      **error);
+			      GError      **error);;
 
-gchar *g_build_path     (const gchar *separator,
+GLIB_FUNC gchar *g_build_path     (const gchar *separator,
 			 const gchar *first_element,
-			 ...);
-gchar *g_build_filename (const gchar *first_element,
-			 ...);
+			 ...);;
+GLIB_FUNC gchar *g_build_filename (const gchar *first_element,
+			 ...);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/ghash.h~visibility.patch
+++ glib-2.4.6/glib/ghash.h
@@ -39,42 +39,42 @@
 
 /* Hash tables
  */
-GHashTable* g_hash_table_new		   (GHashFunc	    hash_func,
-					    GEqualFunc	    key_equal_func);
-GHashTable* g_hash_table_new_full      	   (GHashFunc	    hash_func,
+GLIB_FUNC GHashTable* g_hash_table_new		   (GHashFunc	    hash_func,
+					    GEqualFunc	    key_equal_func);;
+GLIB_FUNC GHashTable* g_hash_table_new_full      	   (GHashFunc	    hash_func,
 					    GEqualFunc	    key_equal_func,
 					    GDestroyNotify  key_destroy_func,
-					    GDestroyNotify  value_destroy_func);
-void	    g_hash_table_destroy	   (GHashTable	   *hash_table);
-void	    g_hash_table_insert		   (GHashTable	   *hash_table,
+					    GDestroyNotify  value_destroy_func);;
+GLIB_FUNC void	    g_hash_table_destroy	   (GHashTable	   *hash_table);
+GLIB_FUNC void	    g_hash_table_insert		   (GHashTable	   *hash_table,
 					    gpointer	    key,
-					    gpointer	    value);
-void        g_hash_table_replace           (GHashTable     *hash_table,
+					    gpointer	    value);;
+GLIB_FUNC void        g_hash_table_replace           (GHashTable     *hash_table,
 					    gpointer	    key,
-					    gpointer	    value);
-gboolean    g_hash_table_remove		   (GHashTable	   *hash_table,
-					    gconstpointer   key);
-gboolean    g_hash_table_steal             (GHashTable     *hash_table,
-					    gconstpointer   key);
-gpointer    g_hash_table_lookup		   (GHashTable	   *hash_table,
-					    gconstpointer   key);
-gboolean    g_hash_table_lookup_extended   (GHashTable	   *hash_table,
+					    gpointer	    value);;
+GLIB_FUNC gboolean    g_hash_table_remove		   (GHashTable	   *hash_table,
+					    gconstpointer   key);;
+GLIB_FUNC gboolean    g_hash_table_steal             (GHashTable     *hash_table,
+					    gconstpointer   key);;
+GLIB_FUNC gpointer    g_hash_table_lookup		   (GHashTable	   *hash_table,
+					    gconstpointer   key);;
+GLIB_FUNC gboolean    g_hash_table_lookup_extended   (GHashTable	   *hash_table,
 					    gconstpointer   lookup_key,
 					    gpointer	   *orig_key,
-					    gpointer	   *value);
-void	    g_hash_table_foreach	   (GHashTable	   *hash_table,
+					    gpointer	   *value);;
+GLIB_FUNC void	    g_hash_table_foreach	   (GHashTable	   *hash_table,
 					    GHFunc	    func,
-					    gpointer	    user_data);
-gpointer    g_hash_table_find	   (GHashTable	   *hash_table,
+					    gpointer	    user_data);;
+GLIB_FUNC gpointer    g_hash_table_find	   (GHashTable	   *hash_table,
 					    GHRFunc	    predicate,
-					    gpointer	    user_data);
-guint	    g_hash_table_foreach_remove	   (GHashTable	   *hash_table,
+					    gpointer	    user_data);;
+GLIB_FUNC guint	    g_hash_table_foreach_remove	   (GHashTable	   *hash_table,
 					    GHRFunc	    func,
-					    gpointer	    user_data);
-guint	    g_hash_table_foreach_steal	   (GHashTable	   *hash_table,
+					    gpointer	    user_data);;
+GLIB_FUNC guint	    g_hash_table_foreach_steal	   (GHashTable	   *hash_table,
 					    GHRFunc	    func,
-					    gpointer	    user_data);
-guint	    g_hash_table_size		   (GHashTable	   *hash_table);
+					    gpointer	    user_data);;
+GLIB_FUNC guint	    g_hash_table_size		   (GHashTable	   *hash_table);
 
 #ifndef G_DISABLE_DEPRECATED
 
@@ -87,13 +87,13 @@
 
 /* Hash Functions
  */
-gboolean g_str_equal (gconstpointer  v,
-                      gconstpointer  v2);
-guint    g_str_hash  (gconstpointer  v);
+GLIB_FUNC gboolean g_str_equal (gconstpointer  v,
+                      gconstpointer  v2);;
+GLIB_FUNC guint    g_str_hash  (gconstpointer  v);
 
-gboolean g_int_equal (gconstpointer  v,
-                      gconstpointer  v2);
-guint    g_int_hash  (gconstpointer  v);
+GLIB_FUNC gboolean g_int_equal (gconstpointer  v,
+                      gconstpointer  v2);;
+GLIB_FUNC guint    g_int_hash  (gconstpointer  v);
 
 /* This "hash" function will just return the key's address as an
  * unsigned integer. Useful for hashing on plain addresses or
@@ -101,8 +101,8 @@
  * Passing NULL into g_hash_table_new() as GHashFunc has the
  * same effect as passing g_direct_hash().
  */
-guint    g_direct_hash  (gconstpointer  v) G_GNUC_CONST;
-gboolean g_direct_equal (gconstpointer  v,
+GLIB_FUNC guint    g_direct_hash  (gconstpointer  v) G_GNUC_CONST;
+GLIB_FUNC gboolean g_direct_equal (gconstpointer  v,
                          gconstpointer  v2) G_GNUC_CONST;
 
 G_END_DECLS
--- glib-2.4.6/glib/ghook.h~visibility.patch
+++ glib-2.4.6/glib/ghook.h
@@ -99,78 +99,78 @@
 
 /* --- prototypes --- */
 /* callback maintenance functions */
-void	 g_hook_list_init		(GHookList		*hook_list,
-					 guint			 hook_size);
-void	 g_hook_list_clear		(GHookList		*hook_list);
-GHook*	 g_hook_alloc			(GHookList		*hook_list);
-void	 g_hook_free			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_ref			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_unref			(GHookList		*hook_list,
-					 GHook			*hook);
-gboolean g_hook_destroy			(GHookList		*hook_list,
-					 gulong			 hook_id);
-void	 g_hook_destroy_link		(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_prepend			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_insert_before		(GHookList		*hook_list,
+GLIB_FUNC void	 g_hook_list_init		(GHookList		*hook_list,
+					 guint			 hook_size);;
+GLIB_FUNC void	 g_hook_list_clear		(GHookList		*hook_list);
+GLIB_FUNC GHook*	 g_hook_alloc			(GHookList		*hook_list);
+GLIB_FUNC void	 g_hook_free			(GHookList		*hook_list,
+					 GHook			*hook);;
+GLIB_FUNC void	 g_hook_ref			(GHookList		*hook_list,
+					 GHook			*hook);;
+GLIB_FUNC void	 g_hook_unref			(GHookList		*hook_list,
+					 GHook			*hook);;
+GLIB_FUNC gboolean g_hook_destroy			(GHookList		*hook_list,
+					 gulong			 hook_id);;
+GLIB_FUNC void	 g_hook_destroy_link		(GHookList		*hook_list,
+					 GHook			*hook);;
+GLIB_FUNC void	 g_hook_prepend			(GHookList		*hook_list,
+					 GHook			*hook);;
+GLIB_FUNC void	 g_hook_insert_before		(GHookList		*hook_list,
 					 GHook			*sibling,
-					 GHook			*hook);
-void	 g_hook_insert_sorted		(GHookList		*hook_list,
+					 GHook			*hook);;
+GLIB_FUNC void	 g_hook_insert_sorted		(GHookList		*hook_list,
 					 GHook			*hook,
-					 GHookCompareFunc	 func);
-GHook*	 g_hook_get			(GHookList		*hook_list,
-					 gulong			 hook_id);
-GHook*	 g_hook_find			(GHookList		*hook_list,
+					 GHookCompareFunc	 func);;
+GLIB_FUNC GHook*	 g_hook_get			(GHookList		*hook_list,
+					 gulong			 hook_id);;
+GLIB_FUNC GHook*	 g_hook_find			(GHookList		*hook_list,
 					 gboolean		 need_valids,
 					 GHookFindFunc		 func,
-					 gpointer		 data);
-GHook*	 g_hook_find_data		(GHookList		*hook_list,
+					 gpointer		 data);;
+GLIB_FUNC GHook*	 g_hook_find_data		(GHookList		*hook_list,
 					 gboolean		 need_valids,
-					 gpointer		 data);
-GHook*	 g_hook_find_func		(GHookList		*hook_list,
+					 gpointer		 data);;
+GLIB_FUNC GHook*	 g_hook_find_func		(GHookList		*hook_list,
 					 gboolean		 need_valids,
-					 gpointer		 func);
-GHook*	 g_hook_find_func_data		(GHookList		*hook_list,
+					 gpointer		 func);;
+GLIB_FUNC GHook*	 g_hook_find_func_data		(GHookList		*hook_list,
 					 gboolean		 need_valids,
 					 gpointer		 func,
-					 gpointer		 data);
+					 gpointer		 data);;
 /* return the first valid hook, and increment its reference count */
-GHook*	 g_hook_first_valid		(GHookList		*hook_list,
-					 gboolean		 may_be_in_call);
+GLIB_FUNC GHook*	 g_hook_first_valid		(GHookList		*hook_list,
+					 gboolean		 may_be_in_call);;
 /* return the next valid hook with incremented reference count, and
  * decrement the reference count of the original hook
  */
-GHook*	 g_hook_next_valid		(GHookList		*hook_list,
+GLIB_FUNC GHook*	 g_hook_next_valid		(GHookList		*hook_list,
 					 GHook			*hook,
-					 gboolean		 may_be_in_call);
+					 gboolean		 may_be_in_call);;
 /* GHookCompareFunc implementation to insert hooks sorted by their id */
-gint	 g_hook_compare_ids		(GHook			*new_hook,
-					 GHook			*sibling);
+GLIB_FUNC gint	 g_hook_compare_ids		(GHook			*new_hook,
+					 GHook			*sibling);;
 /* convenience macros */
 #define	 g_hook_append( hook_list, hook )  \
      g_hook_insert_before ((hook_list), NULL, (hook))
 /* invoke all valid hooks with the (*GHookFunc) signature.
  */
-void	 g_hook_list_invoke		(GHookList		*hook_list,
-					 gboolean		 may_recurse);
+GLIB_FUNC void	 g_hook_list_invoke		(GHookList		*hook_list,
+					 gboolean		 may_recurse);;
 /* invoke all valid hooks with the (*GHookCheckFunc) signature,
  * and destroy the hook if FALSE is returned.
  */
-void	 g_hook_list_invoke_check	(GHookList		*hook_list,
-					 gboolean		 may_recurse);
+GLIB_FUNC void	 g_hook_list_invoke_check	(GHookList		*hook_list,
+					 gboolean		 may_recurse);;
 /* invoke a marshaller on all valid hooks.
  */
-void	 g_hook_list_marshal		(GHookList		*hook_list,
+GLIB_FUNC void	 g_hook_list_marshal		(GHookList		*hook_list,
 					 gboolean		 may_recurse,
 					 GHookMarshaller	 marshaller,
-					 gpointer		 marshal_data);
-void	 g_hook_list_marshal_check	(GHookList		*hook_list,
+					 gpointer		 marshal_data);;
+GLIB_FUNC void	 g_hook_list_marshal_check	(GHookList		*hook_list,
 					 gboolean		 may_recurse,
 					 GHookCheckMarshaller	 marshaller,
-					 gpointer		 marshal_data);
+					 gpointer		 marshal_data);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/giochannel.h~visibility.patch
+++ glib-2.4.6/glib/giochannel.h
@@ -162,112 +162,112 @@
   GIOFlags   (*io_get_flags)     (GIOChannel   *channel);
 };
 
-void        g_io_channel_init   (GIOChannel    *channel);
-void        g_io_channel_ref    (GIOChannel    *channel);
-void        g_io_channel_unref  (GIOChannel    *channel);
+GLIB_FUNC void        g_io_channel_init   (GIOChannel    *channel);
+GLIB_FUNC void        g_io_channel_ref    (GIOChannel    *channel);
+GLIB_FUNC void        g_io_channel_unref  (GIOChannel    *channel);
 
 #ifndef G_DISABLE_DEPRECATED
-GIOError    g_io_channel_read   (GIOChannel    *channel, 
+GLIB_FUNC GIOError    g_io_channel_read   (GIOChannel    *channel, 
 			         gchar         *buf, 
 			         gsize          count,
-			         gsize         *bytes_read);
-GIOError  g_io_channel_write    (GIOChannel    *channel, 
+			         gsize         *bytes_read);;
+GLIB_FUNC GIOError  g_io_channel_write    (GIOChannel    *channel, 
 			         const gchar   *buf, 
 			         gsize          count,
-			         gsize         *bytes_written);
-GIOError  g_io_channel_seek     (GIOChannel    *channel,
+			         gsize         *bytes_written);;
+GLIB_FUNC GIOError  g_io_channel_seek     (GIOChannel    *channel,
 			         gint64         offset, 
-			         GSeekType      type);
-void      g_io_channel_close    (GIOChannel    *channel);
+			         GSeekType      type);;
+GLIB_FUNC void      g_io_channel_close    (GIOChannel    *channel);
 #endif /* G_DISABLE_DEPRECATED */
 
-GIOStatus g_io_channel_shutdown (GIOChannel      *channel,
+GLIB_FUNC GIOStatus g_io_channel_shutdown (GIOChannel      *channel,
 				 gboolean         flush,
-				 GError         **err);
-guint     g_io_add_watch_full   (GIOChannel      *channel,
+				 GError         **err);;
+GLIB_FUNC guint     g_io_add_watch_full   (GIOChannel      *channel,
 				 gint             priority,
 				 GIOCondition     condition,
 				 GIOFunc          func,
 				 gpointer         user_data,
-				 GDestroyNotify   notify);
-GSource * g_io_create_watch     (GIOChannel      *channel,
-				 GIOCondition     condition);
-guint     g_io_add_watch        (GIOChannel      *channel,
+				 GDestroyNotify   notify);;
+GLIB_FUNC GSource * g_io_create_watch     (GIOChannel      *channel,
+				 GIOCondition     condition);;
+GLIB_FUNC guint     g_io_add_watch        (GIOChannel      *channel,
 				 GIOCondition     condition,
 				 GIOFunc          func,
-				 gpointer         user_data);
+				 gpointer         user_data);;
 
 /* character encoding conversion involved functions.
  */
 
-void                  g_io_channel_set_buffer_size      (GIOChannel   *channel,
-							 gsize         size);
-gsize                 g_io_channel_get_buffer_size      (GIOChannel   *channel);
-GIOCondition          g_io_channel_get_buffer_condition (GIOChannel   *channel);
-GIOStatus             g_io_channel_set_flags            (GIOChannel   *channel,
+GLIB_FUNC void                  g_io_channel_set_buffer_size      (GIOChannel   *channel,
+							 gsize         size);;
+GLIB_FUNC gsize                 g_io_channel_get_buffer_size      (GIOChannel   *channel);
+GLIB_FUNC GIOCondition          g_io_channel_get_buffer_condition (GIOChannel   *channel);
+GLIB_FUNC GIOStatus             g_io_channel_set_flags            (GIOChannel   *channel,
 							 GIOFlags      flags,
-							 GError      **error);
-GIOFlags              g_io_channel_get_flags            (GIOChannel   *channel);
-void                  g_io_channel_set_line_term        (GIOChannel   *channel,
+							 GError      **error);;
+GLIB_FUNC GIOFlags              g_io_channel_get_flags            (GIOChannel   *channel);
+GLIB_FUNC void                  g_io_channel_set_line_term        (GIOChannel   *channel,
 							 const gchar  *line_term,
-							 gint          length);
-G_CONST_RETURN gchar* g_io_channel_get_line_term        (GIOChannel   *channel,
-							 gint         *length);
-void		      g_io_channel_set_buffered		(GIOChannel   *channel,
-							 gboolean      buffered);
-gboolean	      g_io_channel_get_buffered		(GIOChannel   *channel);
-GIOStatus             g_io_channel_set_encoding         (GIOChannel   *channel,
+							 gint          length);;
+GLIB_FUNC G_CONST_RETURN gchar* g_io_channel_get_line_term        (GIOChannel   *channel,
+							 gint         *length);;
+GLIB_FUNC void		      g_io_channel_set_buffered		(GIOChannel   *channel,
+							 gboolean      buffered);;
+GLIB_FUNC gboolean	      g_io_channel_get_buffered		(GIOChannel   *channel);
+GLIB_FUNC GIOStatus             g_io_channel_set_encoding         (GIOChannel   *channel,
 							 const gchar  *encoding,
-							 GError      **error);
-G_CONST_RETURN gchar* g_io_channel_get_encoding         (GIOChannel   *channel);
-void                  g_io_channel_set_close_on_unref	(GIOChannel   *channel,
-							 gboolean      do_close);
-gboolean              g_io_channel_get_close_on_unref	(GIOChannel   *channel);
+							 GError      **error);;
+GLIB_FUNC G_CONST_RETURN gchar* g_io_channel_get_encoding         (GIOChannel   *channel);
+GLIB_FUNC void                  g_io_channel_set_close_on_unref	(GIOChannel   *channel,
+							 gboolean      do_close);;
+GLIB_FUNC gboolean              g_io_channel_get_close_on_unref	(GIOChannel   *channel);
 
 
-GIOStatus   g_io_channel_flush            (GIOChannel   *channel,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line        (GIOChannel   *channel,
+GLIB_FUNC GIOStatus   g_io_channel_flush            (GIOChannel   *channel,
+					   GError      **error);;
+GLIB_FUNC GIOStatus   g_io_channel_read_line        (GIOChannel   *channel,
 					   gchar       **str_return,
 					   gsize        *length,
 					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line_string (GIOChannel   *channel,
+					   GError      **error);;
+GLIB_FUNC GIOStatus   g_io_channel_read_line_string (GIOChannel   *channel,
 					   GString      *buffer,
 					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_to_end      (GIOChannel   *channel,
+					   GError      **error);;
+GLIB_FUNC GIOStatus   g_io_channel_read_to_end      (GIOChannel   *channel,
 					   gchar       **str_return,
 					   gsize        *length,
-					   GError      **error);
-GIOStatus   g_io_channel_read_chars       (GIOChannel   *channel,
+					   GError      **error);;
+GLIB_FUNC GIOStatus   g_io_channel_read_chars       (GIOChannel   *channel,
 					   gchar        *buf,
 					   gsize         count,
 					   gsize        *bytes_read,
-					   GError      **error);
-GIOStatus   g_io_channel_read_unichar     (GIOChannel   *channel,
+					   GError      **error);;
+GLIB_FUNC GIOStatus   g_io_channel_read_unichar     (GIOChannel   *channel,
 					   gunichar     *thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_write_chars      (GIOChannel   *channel,
+					   GError      **error);;
+GLIB_FUNC GIOStatus   g_io_channel_write_chars      (GIOChannel   *channel,
 					   const gchar  *buf,
 					   gssize        count,
 					   gsize        *bytes_written,
-					   GError      **error);
-GIOStatus   g_io_channel_write_unichar    (GIOChannel   *channel,
+					   GError      **error);;
+GLIB_FUNC GIOStatus   g_io_channel_write_unichar    (GIOChannel   *channel,
 					   gunichar      thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_seek_position    (GIOChannel   *channel,
+					   GError      **error);;
+GLIB_FUNC GIOStatus   g_io_channel_seek_position    (GIOChannel   *channel,
 					   gint64        offset,
 					   GSeekType     type,
-					   GError      **error);
-GIOChannel* g_io_channel_new_file         (const gchar  *filename,
+					   GError      **error);;
+GLIB_FUNC GIOChannel* g_io_channel_new_file         (const gchar  *filename,
 					   const gchar  *mode,
-					   GError      **error);
+					   GError      **error);;
 
 /* Error handling */
 
-GQuark          g_io_channel_error_quark      (void);
-GIOChannelError g_io_channel_error_from_errno (gint en);
+GLIB_FUNC GQuark          g_io_channel_error_quark      (void);
+GLIB_FUNC GIOChannelError g_io_channel_error_from_errno (gint en);
 
 /* On Unix, IO channels created with this function for any file
  * descriptor or socket.
@@ -287,8 +287,8 @@
  * corresponding concept is file HANDLE. There isn't as of yet a way to
  * get GIOChannels for Win32 file HANDLEs.
  */
-GIOChannel* g_io_channel_unix_new    (int         fd);
-gint        g_io_channel_unix_get_fd (GIOChannel *channel);
+GLIB_FUNC GIOChannel* g_io_channel_unix_new    (int         fd);
+GLIB_FUNC gint        g_io_channel_unix_get_fd (GIOChannel *channel);
 
 
 /* Hook for GClosure / GSource integration. Don't touch */
@@ -308,19 +308,19 @@
  * from the underlying file descriptor. For SOCKETs, it is possible to call
  * recv().
  */
-void        g_io_channel_win32_make_pollfd (GIOChannel   *channel,
+GLIB_FUNC void        g_io_channel_win32_make_pollfd (GIOChannel   *channel,
 					    GIOCondition  condition,
-					    GPollFD      *fd);
+					    GPollFD      *fd);;
 
 /* This can be used to wait a until at least one of the channels is readable.
  * On Unix you would do a select() on the file descriptors of the channels.
  */
-gint        g_io_channel_win32_poll   (GPollFD    *fds,
+GLIB_FUNC gint        g_io_channel_win32_poll   (GPollFD    *fds,
 				       gint        n_fds,
-				       gint        timeout_);
+				       gint        timeout_);;
 
 /* Create an IO channel for Windows messages for window handle hwnd. */
-GIOChannel *g_io_channel_win32_new_messages (guint hwnd);
+GLIB_FUNC GIOChannel *g_io_channel_win32_new_messages (guint hwnd);;
 
 /* Create an IO channel for C runtime (emulated Unix-like) file
  * descriptors. After calling g_io_add_watch() on a IO channel
@@ -331,17 +331,17 @@
  * the file descriptor should be done by this internal GLib
  * thread. Your code should call only g_io_channel_read().
  */
-GIOChannel* g_io_channel_win32_new_fd (gint         fd);
+GLIB_FUNC GIOChannel* g_io_channel_win32_new_fd (gint         fd);
 
 /* Get the C runtime file descriptor of a channel. */
-gint        g_io_channel_win32_get_fd (GIOChannel *channel);
+GLIB_FUNC gint        g_io_channel_win32_get_fd (GIOChannel *channel);
 
 /* Create an IO channel for a winsock socket. The parameter should be
  * a SOCKET. Contrary to IO channels for file descriptors (on *Win32),
  * you can use normal recv() or recvfrom() on sockets even if GLib
  * is polling them.
  */
-GIOChannel *g_io_channel_win32_new_socket (gint socket);
+GLIB_FUNC GIOChannel *g_io_channel_win32_new_socket (gint socket);;
 
 #endif
 
--- glib-2.4.6/glib/glib.def~visibility.patch
+++ glib-2.4.6/glib/glib.def
@@ -1,4 +1,3 @@
-EXPORTS
 	g_allocator_free
 	g_allocator_new
 	g_array_append_vals
@@ -47,9 +46,7 @@
 	g_atomic_int_add
 	g_atomic_int_compare_and_exchange
 	g_atomic_int_exchange_and_add
-;	g_atomic_int_get
 	g_atomic_pointer_compare_and_exchange
-;	g_atomic_pointer_get
 	g_basename
 	g_bit_nth_lsf
 	g_bit_nth_msf
--- glib-2.4.6/glib/glist.h~visibility.patch
+++ glib-2.4.6/glib/glist.h
@@ -42,62 +42,62 @@
 
 /* Doubly linked lists
  */
-void     g_list_push_allocator (GAllocator       *allocator);
-void     g_list_pop_allocator  (void);
-GList*   g_list_alloc          (void);
-void     g_list_free           (GList            *list);
-void     g_list_free_1         (GList            *list);
-GList*   g_list_append         (GList            *list,
-				gpointer          data);
-GList*   g_list_prepend        (GList            *list,
-				gpointer          data);
-GList*   g_list_insert         (GList            *list,
+GLIB_FUNC void     g_list_push_allocator (GAllocator       *allocator);
+GLIB_FUNC void     g_list_pop_allocator  (void);
+GLIB_FUNC GList*   g_list_alloc          (void);
+GLIB_FUNC void     g_list_free           (GList            *list);
+GLIB_FUNC void     g_list_free_1         (GList            *list);
+GLIB_FUNC GList*   g_list_append         (GList            *list,
+				gpointer          data);;
+GLIB_FUNC GList*   g_list_prepend        (GList            *list,
+				gpointer          data);;
+GLIB_FUNC GList*   g_list_insert         (GList            *list,
 				gpointer          data,
-				gint              position);
-GList*   g_list_insert_sorted  (GList            *list,
+				gint              position);;
+GLIB_FUNC GList*   g_list_insert_sorted  (GList            *list,
 				gpointer          data,
-				GCompareFunc      func);
-GList*   g_list_insert_before  (GList            *list,
+				GCompareFunc      func);;
+GLIB_FUNC GList*   g_list_insert_before  (GList            *list,
 				GList            *sibling,
-				gpointer          data);
-GList*   g_list_concat         (GList            *list1,
-				GList            *list2);
-GList*   g_list_remove         (GList            *list,
-				gconstpointer     data);
-GList*   g_list_remove_all     (GList            *list,
-				gconstpointer     data);
-GList*   g_list_remove_link    (GList            *list,
-				GList            *llink);
-GList*   g_list_delete_link    (GList            *list,
-				GList            *link_);
-GList*   g_list_reverse        (GList            *list);
-GList*   g_list_copy           (GList            *list);
-GList*   g_list_nth            (GList            *list,
-				guint             n);
-GList*   g_list_nth_prev       (GList            *list,
-				guint             n);
-GList*   g_list_find           (GList            *list,
-				gconstpointer     data);
-GList*   g_list_find_custom    (GList            *list,
+				gpointer          data);;
+GLIB_FUNC GList*   g_list_concat         (GList            *list1,
+				GList            *list2);;
+GLIB_FUNC GList*   g_list_remove         (GList            *list,
+				gconstpointer     data);;
+GLIB_FUNC GList*   g_list_remove_all     (GList            *list,
+				gconstpointer     data);;
+GLIB_FUNC GList*   g_list_remove_link    (GList            *list,
+				GList            *llink);;
+GLIB_FUNC GList*   g_list_delete_link    (GList            *list,
+				GList            *link_);;
+GLIB_FUNC GList*   g_list_reverse        (GList            *list);
+GLIB_FUNC GList*   g_list_copy           (GList            *list);
+GLIB_FUNC GList*   g_list_nth            (GList            *list,
+				guint             n);;
+GLIB_FUNC GList*   g_list_nth_prev       (GList            *list,
+				guint             n);;
+GLIB_FUNC GList*   g_list_find           (GList            *list,
+				gconstpointer     data);;
+GLIB_FUNC GList*   g_list_find_custom    (GList            *list,
 				gconstpointer     data,
-				GCompareFunc      func);
-gint     g_list_position       (GList            *list,
-				GList            *llink);
-gint     g_list_index          (GList            *list,
-				gconstpointer     data);
-GList*   g_list_last           (GList            *list);
-GList*   g_list_first          (GList            *list);
-guint    g_list_length         (GList            *list);
-void     g_list_foreach        (GList            *list,
+				GCompareFunc      func);;
+GLIB_FUNC gint     g_list_position       (GList            *list,
+				GList            *llink);;
+GLIB_FUNC gint     g_list_index          (GList            *list,
+				gconstpointer     data);;
+GLIB_FUNC GList*   g_list_last           (GList            *list);
+GLIB_FUNC GList*   g_list_first          (GList            *list);
+GLIB_FUNC guint    g_list_length         (GList            *list);
+GLIB_FUNC void     g_list_foreach        (GList            *list,
 				GFunc             func,
-				gpointer          user_data);
-GList*   g_list_sort           (GList            *list,
-				GCompareFunc      compare_func);
-GList*   g_list_sort_with_data (GList            *list,
+				gpointer          user_data);;
+GLIB_FUNC GList*   g_list_sort           (GList            *list,
+				GCompareFunc      compare_func);;
+GLIB_FUNC GList*   g_list_sort_with_data (GList            *list,
 				GCompareDataFunc  compare_func,
-				gpointer          user_data);
-gpointer g_list_nth_data       (GList            *list,
-				guint             n);
+				gpointer          user_data);;
+GLIB_FUNC gpointer g_list_nth_data       (GList            *list,
+				guint             n);;
 
 #define g_list_previous(list)	((list) ? (((GList *)(list))->prev) : NULL)
 #define g_list_next(list)	((list) ? (((GList *)(list))->next) : NULL)
--- glib-2.4.6/glib/gmain.h~visibility.patch
+++ glib-2.4.6/glib/gmain.h
@@ -135,111 +135,111 @@
 
 /* GMainContext: */
 
-GMainContext *g_main_context_new       (void);
-void          g_main_context_ref       (GMainContext *context);
-void          g_main_context_unref     (GMainContext *context);
-GMainContext *g_main_context_default   (void);
+GLIB_FUNC GMainContext *g_main_context_new       (void);;
+GLIB_FUNC void          g_main_context_ref       (GMainContext *context);
+GLIB_FUNC void          g_main_context_unref     (GMainContext *context);
+GLIB_FUNC GMainContext *g_main_context_default   (void);;
 
-gboolean      g_main_context_iteration (GMainContext *context,
-					gboolean      may_block);
-gboolean      g_main_context_pending   (GMainContext *context);
+GLIB_FUNC gboolean      g_main_context_iteration (GMainContext *context,
+					gboolean      may_block);;
+GLIB_FUNC gboolean      g_main_context_pending   (GMainContext *context);
 
 /* For implementation of legacy interfaces
  */
-GSource      *g_main_context_find_source_by_id              (GMainContext *context,
-							     guint         source_id);
-GSource      *g_main_context_find_source_by_user_data       (GMainContext *context,
-							     gpointer      user_data);
-GSource      *g_main_context_find_source_by_funcs_user_data (GMainContext *context,
+GLIB_FUNC GSource      *g_main_context_find_source_by_id              (GMainContext *context,
+							     guint         source_id);;
+GLIB_FUNC GSource      *g_main_context_find_source_by_user_data       (GMainContext *context,
+							     gpointer      user_data);;
+GLIB_FUNC GSource      *g_main_context_find_source_by_funcs_user_data (GMainContext *context,
  							     GSourceFuncs *funcs,
-							     gpointer      user_data);
+							     gpointer      user_data);;
 
 /* Low level functions for implementing custom main loops.
  */
-void     g_main_context_wakeup  (GMainContext *context);
-gboolean g_main_context_acquire (GMainContext *context);
-void     g_main_context_release (GMainContext *context);
-gboolean g_main_context_wait    (GMainContext *context,
+GLIB_FUNC void     g_main_context_wakeup  (GMainContext *context);
+GLIB_FUNC gboolean g_main_context_acquire (GMainContext *context);
+GLIB_FUNC void     g_main_context_release (GMainContext *context);
+GLIB_FUNC gboolean g_main_context_wait    (GMainContext *context,
 				 GCond        *cond,
-				 GMutex       *mutex);
+				 GMutex       *mutex);;
 
-gboolean g_main_context_prepare  (GMainContext *context,
-				  gint         *priority);
-gint     g_main_context_query    (GMainContext *context,
+GLIB_FUNC gboolean g_main_context_prepare  (GMainContext *context,
+				  gint         *priority);;
+GLIB_FUNC gint     g_main_context_query    (GMainContext *context,
 				  gint          max_priority,
 				  gint         *timeout_,
 				  GPollFD      *fds,
-				  gint          n_fds);
-gint     g_main_context_check    (GMainContext *context,
+				  gint          n_fds);;
+GLIB_FUNC gint     g_main_context_check    (GMainContext *context,
 				  gint          max_priority,
 				  GPollFD      *fds,
-				  gint          n_fds);
-void     g_main_context_dispatch (GMainContext *context);
+				  gint          n_fds);;
+GLIB_FUNC void     g_main_context_dispatch (GMainContext *context);
 
-void      g_main_context_set_poll_func (GMainContext *context,
-					GPollFunc     func);
-GPollFunc g_main_context_get_poll_func (GMainContext *context);
+GLIB_FUNC void      g_main_context_set_poll_func (GMainContext *context,
+					GPollFunc     func);;
+GLIB_FUNC GPollFunc g_main_context_get_poll_func (GMainContext *context);
 
 /* Low level functions for use by source implementations
  */
-void g_main_context_add_poll      (GMainContext *context,
+GLIB_FUNC void g_main_context_add_poll      (GMainContext *context,
 				   GPollFD      *fd,
-				   gint          priority);
-void g_main_context_remove_poll   (GMainContext *context,
-				   GPollFD      *fd);
+				   gint          priority);;
+GLIB_FUNC void g_main_context_remove_poll   (GMainContext *context,
+				   GPollFD      *fd);;
 
-int g_main_depth (void);
+GLIB_FUNC int g_main_depth (void);
 
 /* GMainLoop: */
 
-GMainLoop *g_main_loop_new        (GMainContext *context,
-			    	   gboolean      is_running);
-void       g_main_loop_run        (GMainLoop    *loop);
-void       g_main_loop_quit       (GMainLoop    *loop);
-GMainLoop *g_main_loop_ref        (GMainLoop    *loop);
-void       g_main_loop_unref      (GMainLoop    *loop);
-gboolean   g_main_loop_is_running (GMainLoop    *loop);
-GMainContext *g_main_loop_get_context (GMainLoop    *loop);
+GLIB_FUNC GMainLoop *g_main_loop_new        (GMainContext *context,
+			    	   gboolean      is_running);;
+GLIB_FUNC void       g_main_loop_run        (GMainLoop    *loop);
+GLIB_FUNC void       g_main_loop_quit       (GMainLoop    *loop);
+GLIB_FUNC GMainLoop *g_main_loop_ref        (GMainLoop    *loop);;
+GLIB_FUNC void       g_main_loop_unref      (GMainLoop    *loop);
+GLIB_FUNC gboolean   g_main_loop_is_running (GMainLoop    *loop);
+GLIB_FUNC GMainContext *g_main_loop_get_context (GMainLoop    *loop);;
 
 /* GSource: */
 
-GSource *g_source_new             (GSourceFuncs   *source_funcs,
-				   guint           struct_size);
-GSource *g_source_ref             (GSource        *source);
-void     g_source_unref           (GSource        *source);
+GLIB_FUNC GSource *g_source_new             (GSourceFuncs   *source_funcs,
+				   guint           struct_size);;
+GLIB_FUNC GSource *g_source_ref             (GSource        *source);;
+GLIB_FUNC void     g_source_unref           (GSource        *source);
 
-guint    g_source_attach          (GSource        *source,
-				   GMainContext   *context);
-void     g_source_destroy         (GSource        *source);
+GLIB_FUNC guint    g_source_attach          (GSource        *source,
+				   GMainContext   *context);;
+GLIB_FUNC void     g_source_destroy         (GSource        *source);
 
-void     g_source_set_priority    (GSource        *source,
-				   gint            priority);
-gint     g_source_get_priority    (GSource        *source);
-void     g_source_set_can_recurse (GSource        *source,
-				   gboolean        can_recurse);
-gboolean g_source_get_can_recurse (GSource        *source);
-guint    g_source_get_id          (GSource        *source);
+GLIB_FUNC void     g_source_set_priority    (GSource        *source,
+				   gint            priority);;
+GLIB_FUNC gint     g_source_get_priority    (GSource        *source);
+GLIB_FUNC void     g_source_set_can_recurse (GSource        *source,
+				   gboolean        can_recurse);;
+GLIB_FUNC gboolean g_source_get_can_recurse (GSource        *source);
+GLIB_FUNC guint    g_source_get_id          (GSource        *source);
 
-GMainContext *g_source_get_context (GSource       *source);
+GLIB_FUNC GMainContext *g_source_get_context (GSource       *source);;
 
-void g_source_set_callback          (GSource              *source,
+GLIB_FUNC void g_source_set_callback          (GSource              *source,
 				     GSourceFunc           func,
 				     gpointer              data,
-				     GDestroyNotify        notify);
+				     GDestroyNotify        notify);;
 
 
 /* Used to implement g_source_connect_closure and internally*/
-void g_source_set_callback_indirect (GSource              *source,
+GLIB_FUNC void g_source_set_callback_indirect (GSource              *source,
 				     gpointer              callback_data,
-				     GSourceCallbackFuncs *callback_funcs);
+				     GSourceCallbackFuncs *callback_funcs);;
 
-void     g_source_add_poll         (GSource        *source,
-				    GPollFD        *fd);
-void     g_source_remove_poll      (GSource        *source,
-				    GPollFD        *fd);
+GLIB_FUNC void     g_source_add_poll         (GSource        *source,
+				    GPollFD        *fd);;
+GLIB_FUNC void     g_source_remove_poll      (GSource        *source,
+				    GPollFD        *fd);;
 
-void     g_source_get_current_time (GSource        *source,
-				    GTimeVal       *timeval);
+GLIB_FUNC void     g_source_get_current_time (GSource        *source,
+				    GTimeVal       *timeval);;
 
  /* void g_source_connect_closure (GSource        *source,
                                   GClosure       *closure);
@@ -247,13 +247,13 @@
 
 /* Specific source types
  */
-GSource *g_idle_source_new        (void);
-GSource *g_child_watch_source_new (GPid pid);
-GSource *g_timeout_source_new     (guint interval);
+GLIB_FUNC GSource *g_idle_source_new        (void);;
+GLIB_FUNC GSource *g_child_watch_source_new (GPid pid);;
+GLIB_FUNC GSource *g_timeout_source_new     (guint interval);;
 
 /* Miscellaneous functions
  */
-void g_get_current_time		        (GTimeVal	*result);
+GLIB_FUNC void g_get_current_time		        (GTimeVal	*result);
 
 /* ============== Compat main loop stuff ================== */
 
@@ -278,35 +278,35 @@
 #endif /* G_DISABLE_DEPRECATED */
 
 /* Source manipulation by ID */
-gboolean g_source_remove                     (guint          tag);
-gboolean g_source_remove_by_user_data        (gpointer       user_data);
-gboolean g_source_remove_by_funcs_user_data  (GSourceFuncs  *funcs,
-					      gpointer       user_data);
+GLIB_FUNC gboolean g_source_remove                     (guint          tag);
+GLIB_FUNC gboolean g_source_remove_by_user_data        (gpointer       user_data);
+GLIB_FUNC gboolean g_source_remove_by_funcs_user_data  (GSourceFuncs  *funcs,
+					      gpointer       user_data);;
 
 /* Idles, child watchers and timeouts */
-guint    g_timeout_add_full     (gint            priority,
+GLIB_FUNC guint    g_timeout_add_full     (gint            priority,
 				 guint           interval,
 				 GSourceFunc     function,
 				 gpointer        data,
-				 GDestroyNotify  notify);
-guint    g_timeout_add          (guint           interval,
+				 GDestroyNotify  notify);;
+GLIB_FUNC guint    g_timeout_add          (guint           interval,
 				 GSourceFunc     function,
-				 gpointer        data);
-guint    g_child_watch_add_full (gint            priority,
+				 gpointer        data);;
+GLIB_FUNC guint    g_child_watch_add_full (gint            priority,
 				 GPid            pid,
 				 GChildWatchFunc function,
 				 gpointer        data,
-				 GDestroyNotify  notify);
-guint    g_child_watch_add      (GPid            pid,
+				 GDestroyNotify  notify);;
+GLIB_FUNC guint    g_child_watch_add      (GPid            pid,
 				 GChildWatchFunc function,
-				 gpointer        data);
-guint    g_idle_add             (GSourceFunc     function,
-				 gpointer        data);
-guint    g_idle_add_full        (gint            priority,
+				 gpointer        data);;
+GLIB_FUNC guint    g_idle_add             (GSourceFunc     function,
+				 gpointer        data);;
+GLIB_FUNC guint    g_idle_add_full        (gint            priority,
 				 GSourceFunc     function,
 				 gpointer        data,
-				 GDestroyNotify  notify);
-gboolean g_idle_remove_by_data  (gpointer        data);
+				 GDestroyNotify  notify);;
+GLIB_FUNC gboolean g_idle_remove_by_data  (gpointer        data);
 
 /* Hook for GClosure / GSource integration. Don't touch */
 GLIB_VAR GSourceFuncs g_timeout_funcs;
--- glib-2.4.6/glib/gmarkup.h~visibility.patch
+++ glib-2.4.6/glib/gmarkup.h
@@ -42,7 +42,7 @@
 
 #define G_MARKUP_ERROR g_markup_error_quark ()
 
-GQuark g_markup_error_quark (void);
+GLIB_FUNC GQuark g_markup_error_quark (void);
 
 typedef enum
 {
@@ -97,33 +97,33 @@
                           gpointer             user_data);
 };
 
-GMarkupParseContext *g_markup_parse_context_new   (const GMarkupParser *parser,
+GLIB_FUNC GMarkupParseContext *g_markup_parse_context_new   (const GMarkupParser *parser,
                                                    GMarkupParseFlags    flags,
                                                    gpointer             user_data,
-                                                   GDestroyNotify       user_data_dnotify);
-void                 g_markup_parse_context_free  (GMarkupParseContext *context);
-gboolean             g_markup_parse_context_parse (GMarkupParseContext *context,
+                                                   GDestroyNotify       user_data_dnotify);;
+GLIB_FUNC void                 g_markup_parse_context_free  (GMarkupParseContext *context);
+GLIB_FUNC gboolean             g_markup_parse_context_parse (GMarkupParseContext *context,
                                                    const gchar         *text,
                                                    gssize               text_len,  
-                                                   GError             **error);
+                                                   GError             **error);;
                                                    
-gboolean             g_markup_parse_context_end_parse (GMarkupParseContext *context,
-                                                       GError             **error);
-G_CONST_RETURN gchar *g_markup_parse_context_get_element (GMarkupParseContext *context);
+GLIB_FUNC gboolean             g_markup_parse_context_end_parse (GMarkupParseContext *context,
+                                                       GError             **error);;
+GLIB_FUNC G_CONST_RETURN gchar *g_markup_parse_context_get_element (GMarkupParseContext *context);
 
 /* For user-constructed error messages, has no precise semantics */
-void                 g_markup_parse_context_get_position (GMarkupParseContext *context,
+GLIB_FUNC void                 g_markup_parse_context_get_position (GMarkupParseContext *context,
                                                           gint                *line_number,
-                                                          gint                *char_number);
+                                                          gint                *char_number);;
 
 /* useful when saving */
-gchar* g_markup_escape_text (const gchar *text,
-                             gssize       length);  
+GLIB_FUNC gchar* g_markup_escape_text (const gchar *text,
+                             gssize       length);;  
 
-gchar *g_markup_printf_escaped (const char *format,
-				...) G_GNUC_PRINTF (1, 2);
-gchar *g_markup_vprintf_escaped (const char *format,
-				 va_list     args);
+GLIB_FUNC gchar *g_markup_printf_escaped (const char *format,
+				...) G_GNUC_PRINTF (1, 2);;
+GLIB_FUNC gchar *g_markup_vprintf_escaped (const char *format,
+				 va_list     args);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gmem.h~visibility.patch
+++ glib-2.4.6/glib/gmem.h
@@ -45,14 +45,14 @@
 
 /* Memory allocation functions
  */
-gpointer g_malloc         (gulong	 n_bytes);
-gpointer g_malloc0        (gulong	 n_bytes);
-gpointer g_realloc        (gpointer	 mem,
-			   gulong	 n_bytes);
-void	 g_free	          (gpointer	 mem);
-gpointer g_try_malloc     (gulong	 n_bytes);
-gpointer g_try_realloc    (gpointer	 mem,
-			   gulong	 n_bytes);
+GLIB_FUNC gpointer g_malloc         (gulong	 n_bytes);
+GLIB_FUNC gpointer g_malloc0        (gulong	 n_bytes);
+GLIB_FUNC gpointer g_realloc        (gpointer	 mem,
+			   gulong	 n_bytes);;
+GLIB_FUNC void	 g_free	          (gpointer	 mem);
+GLIB_FUNC gpointer g_try_malloc     (gulong	 n_bytes);
+GLIB_FUNC gpointer g_try_realloc    (gpointer	 mem,
+			   gulong	 n_bytes);;
 
 
 /* Convenience memory allocators
@@ -82,13 +82,13 @@
   gpointer (*try_realloc) (gpointer mem,
 			   gsize    n_bytes);
 };
-void	 g_mem_set_vtable (GMemVTable	*vtable);
-gboolean g_mem_is_system_malloc (void);
+GLIB_FUNC void	 g_mem_set_vtable (GMemVTable	*vtable);
+GLIB_FUNC gboolean g_mem_is_system_malloc (void);
 
 /* Memory profiler and checker, has to be enabled via g_mem_set_vtable()
  */
 GLIB_VAR GMemVTable	*glib_mem_profiler_table;
-void	g_mem_profile	(void);
+GLIB_FUNC void	g_mem_profile	(void);
 
 
 /* Memchunk convenience functions
@@ -132,19 +132,19 @@
 #define G_ALLOC_ONLY	  1
 #define G_ALLOC_AND_FREE  2
 
-GMemChunk* g_mem_chunk_new     (const gchar *name,
+GLIB_FUNC GMemChunk* g_mem_chunk_new     (const gchar *name,
 				gint         atom_size,
 				gulong       area_size,
-				gint         type);
-void       g_mem_chunk_destroy (GMemChunk   *mem_chunk);
-gpointer   g_mem_chunk_alloc   (GMemChunk   *mem_chunk);
-gpointer   g_mem_chunk_alloc0  (GMemChunk   *mem_chunk);
-void       g_mem_chunk_free    (GMemChunk   *mem_chunk,
-				gpointer     mem);
-void       g_mem_chunk_clean   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_reset   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_print   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_info    (void);
+				gint         type);;
+GLIB_FUNC void       g_mem_chunk_destroy (GMemChunk   *mem_chunk);
+GLIB_FUNC gpointer   g_mem_chunk_alloc   (GMemChunk   *mem_chunk);
+GLIB_FUNC gpointer   g_mem_chunk_alloc0  (GMemChunk   *mem_chunk);
+GLIB_FUNC void       g_mem_chunk_free    (GMemChunk   *mem_chunk,
+				gpointer     mem);;
+GLIB_FUNC void       g_mem_chunk_clean   (GMemChunk   *mem_chunk);
+GLIB_FUNC void       g_mem_chunk_reset   (GMemChunk   *mem_chunk);
+GLIB_FUNC void       g_mem_chunk_print   (GMemChunk   *mem_chunk);
+GLIB_FUNC void       g_mem_chunk_info    (void);
 
 /* Ah yes...we have a "g_blow_chunks" function.
  * "g_blow_chunks" simply compresses all the chunks. This operation
@@ -154,14 +154,14 @@
  *  much better name than "g_mem_chunk_clean_all" or something
  *  similar.
  */
-void	   g_blow_chunks (void);
+GLIB_FUNC void	   g_blow_chunks (void);
 
 
 /* Generic allocators
  */
-GAllocator* g_allocator_new   (const gchar  *name,
-			       guint         n_preallocs);
-void        g_allocator_free  (GAllocator   *allocator);
+GLIB_FUNC GAllocator* g_allocator_new   (const gchar  *name,
+			       guint         n_preallocs);;
+GLIB_FUNC void        g_allocator_free  (GAllocator   *allocator);
 
 /* internal */
 #define	G_ALLOCATOR_LIST	(1)
--- glib-2.4.6/glib/gmessages.h~visibility.patch
+++ glib-2.4.6/glib/gmessages.h
@@ -41,8 +41,8 @@
 
 /* calculate a string size, guaranteed to fit format + args.
  */
-gsize	g_printf_string_upper_bound (const gchar* format,
-				     va_list	  args);
+GLIB_FUNC gsize	g_printf_string_upper_bound (const gchar* format,
+				     va_list	  args);;
 
 /* Log level shift offset for user defined
  * log levels (0-7 are used by GLib).
@@ -78,27 +78,27 @@
 
 /* Logging mechanism
  */
-guint           g_log_set_handler       (const gchar    *log_domain,
+GLIB_FUNC guint           g_log_set_handler       (const gchar    *log_domain,
                                          GLogLevelFlags  log_levels,
                                          GLogFunc        log_func,
-                                         gpointer        user_data);
-void            g_log_remove_handler    (const gchar    *log_domain,
-                                         guint           handler_id);
-void            g_log_default_handler   (const gchar    *log_domain,
+                                         gpointer        user_data);;
+GLIB_FUNC void            g_log_remove_handler    (const gchar    *log_domain,
+                                         guint           handler_id);;
+GLIB_FUNC void            g_log_default_handler   (const gchar    *log_domain,
                                          GLogLevelFlags  log_level,
                                          const gchar    *message,
-                                         gpointer        unused_data);
-void            g_log                   (const gchar    *log_domain,
+                                         gpointer        unused_data);;
+GLIB_FUNC void            g_log                   (const gchar    *log_domain,
                                          GLogLevelFlags  log_level,
                                          const gchar    *format,
-                                         ...) G_GNUC_PRINTF (3, 4);
-void            g_logv                  (const gchar    *log_domain,
+                                         ...) G_GNUC_PRINTF (3, 4);;
+GLIB_FUNC void            g_logv                  (const gchar    *log_domain,
                                          GLogLevelFlags  log_level,
                                          const gchar    *format,
-                                         va_list         args);
-GLogLevelFlags  g_log_set_fatal_mask    (const gchar    *log_domain,
-                                         GLogLevelFlags  fatal_mask);
-GLogLevelFlags  g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
+                                         va_list         args);;
+GLIB_FUNC GLogLevelFlags  g_log_set_fatal_mask    (const gchar    *log_domain,
+                                         GLogLevelFlags  fatal_mask);;
+GLIB_FUNC GLogLevelFlags  g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
 
 /* internal */
 void	_g_log_fallback_handler	(const gchar   *log_domain,
@@ -176,12 +176,12 @@
 #endif  /* !__GNUC__ */
 
 typedef void    (*GPrintFunc)           (const gchar    *string);
-void            g_print                 (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_print_handler     (GPrintFunc      func);
-void            g_printerr              (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
+GLIB_FUNC void            g_print                 (const gchar    *format,
+                                         ...) G_GNUC_PRINTF (1, 2);;
+GLIB_FUNC GPrintFunc      g_set_print_handler     (GPrintFunc      func);
+GLIB_FUNC void            g_printerr              (const gchar    *format,
+                                         ...) G_GNUC_PRINTF (1, 2);;
+GLIB_FUNC GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
 
 
 /* Provide macros for error handling. The "assert" macros will
--- glib-2.4.6/glib/gnode.h~visibility.patch
+++ glib-2.4.6/glib/gnode.h
@@ -74,36 +74,36 @@
 				 ((GNode*) (node))->next == NULL)
 #define	 G_NODE_IS_LEAF(node)	(((GNode*) (node))->children == NULL)
 
-void     g_node_push_allocator  (GAllocator       *allocator);
-void     g_node_pop_allocator   (void);
-GNode*	 g_node_new		(gpointer	   data);
-void	 g_node_destroy		(GNode		  *root);
-void	 g_node_unlink		(GNode		  *node);
-GNode*   g_node_copy_deep       (GNode            *node,
+GLIB_FUNC void     g_node_push_allocator  (GAllocator       *allocator);
+GLIB_FUNC void     g_node_pop_allocator   (void);
+GLIB_FUNC GNode*	 g_node_new		(gpointer	   data);
+GLIB_FUNC void	 g_node_destroy		(GNode		  *root);
+GLIB_FUNC void	 g_node_unlink		(GNode		  *node);
+GLIB_FUNC GNode*   g_node_copy_deep       (GNode            *node,
 				 GCopyFunc         copy_func,
-				 gpointer          data);
-GNode*   g_node_copy            (GNode            *node);
-GNode*	 g_node_insert		(GNode		  *parent,
+				 gpointer          data);;
+GLIB_FUNC GNode*   g_node_copy            (GNode            *node);
+GLIB_FUNC GNode*	 g_node_insert		(GNode		  *parent,
 				 gint		   position,
-				 GNode		  *node);
-GNode*	 g_node_insert_before	(GNode		  *parent,
+				 GNode		  *node);;
+GLIB_FUNC GNode*	 g_node_insert_before	(GNode		  *parent,
 				 GNode		  *sibling,
-				 GNode		  *node);
-GNode*   g_node_insert_after    (GNode            *parent,
+				 GNode		  *node);;
+GLIB_FUNC GNode*   g_node_insert_after    (GNode            *parent,
 				 GNode            *sibling,
-				 GNode            *node); 
-GNode*	 g_node_prepend		(GNode		  *parent,
-				 GNode		  *node);
-guint	 g_node_n_nodes		(GNode		  *root,
-				 GTraverseFlags	   flags);
-GNode*	 g_node_get_root	(GNode		  *node);
-gboolean g_node_is_ancestor	(GNode		  *node,
-				 GNode		  *descendant);
-guint	 g_node_depth		(GNode		  *node);
-GNode*	 g_node_find		(GNode		  *root,
+				 GNode            *node);; 
+GLIB_FUNC GNode*	 g_node_prepend		(GNode		  *parent,
+				 GNode		  *node);;
+GLIB_FUNC guint	 g_node_n_nodes		(GNode		  *root,
+				 GTraverseFlags	   flags);;
+GLIB_FUNC GNode*	 g_node_get_root	(GNode		  *node);
+GLIB_FUNC gboolean g_node_is_ancestor	(GNode		  *node,
+				 GNode		  *descendant);;
+GLIB_FUNC guint	 g_node_depth		(GNode		  *node);
+GLIB_FUNC GNode*	 g_node_find		(GNode		  *root,
 				 GTraverseType	   order,
 				 GTraverseFlags	   flags,
-				 gpointer	   data);
+				 gpointer	   data);;
 
 /* convenience macros */
 #define g_node_append(parent, node)				\
@@ -122,39 +122,39 @@
  * this function is just a high level interface to
  * low level traversal functions, optimized for speed.
  */
-void	 g_node_traverse	(GNode		  *root,
+GLIB_FUNC void	 g_node_traverse	(GNode		  *root,
 				 GTraverseType	   order,
 				 GTraverseFlags	   flags,
 				 gint		   max_depth,
 				 GNodeTraverseFunc func,
-				 gpointer	   data);
+				 gpointer	   data);;
 
 /* return the maximum tree height starting with `node', this is an expensive
  * operation, since we need to visit all nodes. this could be shortened by
  * adding `guint height' to struct _GNode, but then again, this is not very
  * often needed, and would make g_node_insert() more time consuming.
  */
-guint	 g_node_max_height	 (GNode *root);
+GLIB_FUNC guint	 g_node_max_height	 (GNode *root);
 
-void	 g_node_children_foreach (GNode		  *node,
+GLIB_FUNC void	 g_node_children_foreach (GNode		  *node,
 				  GTraverseFlags   flags,
 				  GNodeForeachFunc func,
-				  gpointer	   data);
-void	 g_node_reverse_children (GNode		  *node);
-guint	 g_node_n_children	 (GNode		  *node);
-GNode*	 g_node_nth_child	 (GNode		  *node,
-				  guint		   n);
-GNode*	 g_node_last_child	 (GNode		  *node);
-GNode*	 g_node_find_child	 (GNode		  *node,
+				  gpointer	   data);;
+GLIB_FUNC void	 g_node_reverse_children (GNode		  *node);
+GLIB_FUNC guint	 g_node_n_children	 (GNode		  *node);
+GLIB_FUNC GNode*	 g_node_nth_child	 (GNode		  *node,
+				  guint		   n);;
+GLIB_FUNC GNode*	 g_node_last_child	 (GNode		  *node);
+GLIB_FUNC GNode*	 g_node_find_child	 (GNode		  *node,
 				  GTraverseFlags   flags,
-				  gpointer	   data);
-gint	 g_node_child_position	 (GNode		  *node,
-				  GNode		  *child);
-gint	 g_node_child_index	 (GNode		  *node,
-				  gpointer	   data);
+				  gpointer	   data);;
+GLIB_FUNC gint	 g_node_child_position	 (GNode		  *node,
+				  GNode		  *child);;
+GLIB_FUNC gint	 g_node_child_index	 (GNode		  *node,
+				  gpointer	   data);;
 
-GNode*	 g_node_first_sibling	 (GNode		  *node);
-GNode*	 g_node_last_sibling	 (GNode		  *node);
+GLIB_FUNC GNode*	 g_node_first_sibling	 (GNode		  *node);
+GLIB_FUNC GNode*	 g_node_last_sibling	 (GNode		  *node);
 
 #define	 g_node_prev_sibling(node)	((node) ? \
 					 ((GNode*) (node))->prev : NULL)
--- glib-2.4.6/glib/gpattern.h~visibility.patch
+++ glib-2.4.6/glib/gpattern.h
@@ -26,18 +26,18 @@
 
 typedef struct _GPatternSpec    GPatternSpec;
 
-GPatternSpec* g_pattern_spec_new       (const gchar  *pattern);
-void          g_pattern_spec_free      (GPatternSpec *pspec);
-gboolean      g_pattern_spec_equal     (GPatternSpec *pspec1,
-					GPatternSpec *pspec2);
-gboolean      g_pattern_match          (GPatternSpec *pspec,
+GLIB_FUNC GPatternSpec* g_pattern_spec_new       (const gchar  *pattern);
+GLIB_FUNC void          g_pattern_spec_free      (GPatternSpec *pspec);
+GLIB_FUNC gboolean      g_pattern_spec_equal     (GPatternSpec *pspec1,
+					GPatternSpec *pspec2);;
+GLIB_FUNC gboolean      g_pattern_match          (GPatternSpec *pspec,
 					guint         string_length,
 					const gchar  *string,
-					const gchar  *string_reversed);
-gboolean      g_pattern_match_string   (GPatternSpec *pspec,
-					const gchar  *string);
-gboolean      g_pattern_match_simple   (const gchar  *pattern,
-					const gchar  *string);
+					const gchar  *string_reversed);;
+GLIB_FUNC gboolean      g_pattern_match_string   (GPatternSpec *pspec,
+					const gchar  *string);;
+GLIB_FUNC gboolean      g_pattern_match_simple   (const gchar  *pattern,
+					const gchar  *string);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gprimes.h~visibility.patch
+++ glib-2.4.6/glib/gprimes.h
@@ -40,7 +40,7 @@
  * next largest prime, or the highest it knows about which is about
  * MAXINT/4.
  */
-guint	   g_spaced_primes_closest (guint num) G_GNUC_CONST;
+GLIB_FUNC guint	   g_spaced_primes_closest (guint num) G_GNUC_CONST;;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gprintf.h~visibility.patch
+++ glib-2.4.6/glib/gprintf.h
@@ -25,34 +25,34 @@
 
 G_BEGIN_DECLS
 
-gint                  g_printf    (gchar const *format,
-                                   ...) G_GNUC_PRINTF (1, 2);            
-gint                  g_fprintf   (FILE        *file,
+GLIB_FUNC gint                  g_printf    (gchar const *format,
+                                   ...) G_GNUC_PRINTF (1, 2);;            
+GLIB_FUNC gint                  g_fprintf   (FILE        *file,
 				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-gint                  g_sprintf   (gchar       *string,
+				   ...) G_GNUC_PRINTF (2, 3);;
+GLIB_FUNC gint                  g_sprintf   (gchar       *string,
 				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-gint                  g_snprintf  (gchar       *string,
+				   ...) G_GNUC_PRINTF (2, 3);;
+GLIB_FUNC gint                  g_snprintf  (gchar       *string,
 				   gulong       n,
 				   gchar const *format,
-				   ...) G_GNUC_PRINTF (3, 4);
+				   ...) G_GNUC_PRINTF (3, 4);;
 
-gint                  g_vprintf   (gchar const *format,
-                                   va_list      args);            
-gint                  g_vfprintf  (FILE        *file,
+GLIB_FUNC gint                  g_vprintf   (gchar const *format,
+                                   va_list      args);;            
+GLIB_FUNC gint                  g_vfprintf  (FILE        *file,
 				   gchar const *format,
-				   va_list      args);
-gint                  g_vsprintf  (gchar       *string,
+				   va_list      args);;
+GLIB_FUNC gint                  g_vsprintf  (gchar       *string,
 				   gchar const *format,
-				   va_list      args);
-gint                  g_vsnprintf (gchar       *string,
+				   va_list      args);;
+GLIB_FUNC gint                  g_vsnprintf (gchar       *string,
 				   gulong       n,
 				   gchar const *format,
-				   va_list      args);
-gint                  g_vasprintf (gchar      **string,
+				   va_list      args);;
+GLIB_FUNC gint                  g_vasprintf (gchar      **string,
 				   gchar const *format,
-				   va_list      args);
+				   va_list      args);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gqsort.h~visibility.patch
+++ glib-2.4.6/glib/gqsort.h
@@ -32,11 +32,11 @@
 
 G_BEGIN_DECLS
 
-void g_qsort_with_data (gconstpointer    pbase,
+GLIB_FUNC void g_qsort_with_data (gconstpointer    pbase,
 			gint             total_elems,
 			gsize            size,
 			GCompareDataFunc compare_func,
-			gpointer         user_data);
+			gpointer         user_data);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gquark.h~visibility.patch
+++ glib-2.4.6/glib/gquark.h
@@ -35,10 +35,10 @@
 
 /* Quarks (string<->id association)
  */
-GQuark                g_quark_try_string         (const gchar *string);
-GQuark                g_quark_from_static_string (const gchar *string);
-GQuark                g_quark_from_string        (const gchar *string);
-G_CONST_RETURN gchar* g_quark_to_string          (GQuark       quark) G_GNUC_CONST;
+GLIB_FUNC GQuark                g_quark_try_string         (const gchar *string);
+GLIB_FUNC GQuark                g_quark_from_static_string (const gchar *string);
+GLIB_FUNC GQuark                g_quark_from_string        (const gchar *string);
+GLIB_FUNC G_CONST_RETURN gchar* g_quark_to_string          (GQuark       quark) G_GNUC_CONST;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gqueue.h~visibility.patch
+++ glib-2.4.6/glib/gqueue.h
@@ -42,77 +42,77 @@
 
 /* Queues
  */
-GQueue*  g_queue_new            (void);
-void     g_queue_free           (GQueue           *queue);
-gboolean g_queue_is_empty       (GQueue           *queue);
-guint    g_queue_get_length     (GQueue           *queue);
-void     g_queue_reverse        (GQueue           *queue);
-GQueue * g_queue_copy           (GQueue           *queue);
-void     g_queue_foreach        (GQueue           *queue,
+GLIB_FUNC GQueue*  g_queue_new            (void);
+GLIB_FUNC void     g_queue_free           (GQueue           *queue);
+GLIB_FUNC gboolean g_queue_is_empty       (GQueue           *queue);
+GLIB_FUNC guint    g_queue_get_length     (GQueue           *queue);
+GLIB_FUNC void     g_queue_reverse        (GQueue           *queue);
+GLIB_FUNC GQueue * g_queue_copy           (GQueue           *queue);
+GLIB_FUNC void     g_queue_foreach        (GQueue           *queue,
 				 GFunc             func,
-				 gpointer          user_data);
-GList *  g_queue_find           (GQueue           *queue,
-				 gconstpointer     data);
-GList *  g_queue_find_custom    (GQueue           *queue,
+				 gpointer          user_data);;
+GLIB_FUNC GList *  g_queue_find           (GQueue           *queue,
+				 gconstpointer     data);;
+GLIB_FUNC GList *  g_queue_find_custom    (GQueue           *queue,
 				 gconstpointer     data,
-				 GCompareFunc      func);
-void     g_queue_sort           (GQueue           *queue,
+				 GCompareFunc      func);;
+GLIB_FUNC void     g_queue_sort           (GQueue           *queue,
 				 GCompareDataFunc  compare_func,
-				 gpointer          user_data);
+				 gpointer          user_data);;
 
-void     g_queue_push_head      (GQueue           *queue,
-				 gpointer          data);
-void     g_queue_push_tail      (GQueue           *queue,
-				 gpointer          data);
-void     g_queue_push_nth       (GQueue           *queue,
+GLIB_FUNC void     g_queue_push_head      (GQueue           *queue,
+				 gpointer          data);;
+GLIB_FUNC void     g_queue_push_tail      (GQueue           *queue,
+				 gpointer          data);;
+GLIB_FUNC void     g_queue_push_nth       (GQueue           *queue,
 				 gpointer          data,
-				 gint              n);
-gpointer g_queue_pop_head       (GQueue           *queue);
-gpointer g_queue_pop_tail       (GQueue           *queue);
-gpointer g_queue_pop_nth        (GQueue           *queue,
-				 guint             n);
-gpointer g_queue_peek_head      (GQueue           *queue);
-gpointer g_queue_peek_tail      (GQueue           *queue);
-gpointer g_queue_peek_nth       (GQueue           *queue,
-				 guint             n);
-gint     g_queue_index          (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_remove         (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_remove_all     (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_insert_before  (GQueue           *queue,
+				 gint              n);;
+GLIB_FUNC gpointer g_queue_pop_head       (GQueue           *queue);
+GLIB_FUNC gpointer g_queue_pop_tail       (GQueue           *queue);
+GLIB_FUNC gpointer g_queue_pop_nth        (GQueue           *queue,
+				 guint             n);;
+GLIB_FUNC gpointer g_queue_peek_head      (GQueue           *queue);
+GLIB_FUNC gpointer g_queue_peek_tail      (GQueue           *queue);
+GLIB_FUNC gpointer g_queue_peek_nth       (GQueue           *queue,
+				 guint             n);;
+GLIB_FUNC gint     g_queue_index          (GQueue           *queue,
+				 gconstpointer     data);;
+GLIB_FUNC void     g_queue_remove         (GQueue           *queue,
+				 gconstpointer     data);;
+GLIB_FUNC void     g_queue_remove_all     (GQueue           *queue,
+				 gconstpointer     data);;
+GLIB_FUNC void     g_queue_insert_before  (GQueue           *queue,
 				 GList            *sibling,
-				 gpointer          data);
-void     g_queue_insert_after   (GQueue           *queue,
+				 gpointer          data);;
+GLIB_FUNC void     g_queue_insert_after   (GQueue           *queue,
 				 GList            *sibling,
-				 gpointer          data);
-void     g_queue_insert_sorted  (GQueue           *queue,
+				 gpointer          data);;
+GLIB_FUNC void     g_queue_insert_sorted  (GQueue           *queue,
 				 gpointer          data,
 				 GCompareDataFunc  func,
-				 gpointer          user_data);
+				 gpointer          user_data);;
 
-void     g_queue_push_head_link (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_push_tail_link (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_push_nth_link  (GQueue           *queue,
+GLIB_FUNC void     g_queue_push_head_link (GQueue           *queue,
+				 GList            *link_);;
+GLIB_FUNC void     g_queue_push_tail_link (GQueue           *queue,
+				 GList            *link_);;
+GLIB_FUNC void     g_queue_push_nth_link  (GQueue           *queue,
 				 gint              n,
-				 GList            *link_);
-GList*   g_queue_pop_head_link  (GQueue           *queue);
-GList*   g_queue_pop_tail_link  (GQueue           *queue);
-GList*   g_queue_pop_nth_link   (GQueue           *queue,
-				 guint             n);
-GList*   g_queue_peek_head_link (GQueue           *queue);
-GList*   g_queue_peek_tail_link (GQueue           *queue);
-GList*   g_queue_peek_nth_link  (GQueue           *queue,
-				 guint             n);
-gint     g_queue_link_index     (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_unlink         (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_delete_link    (GQueue           *queue,
-				 GList            *link_);
+				 GList            *link_);;
+GLIB_FUNC GList*   g_queue_pop_head_link  (GQueue           *queue);
+GLIB_FUNC GList*   g_queue_pop_tail_link  (GQueue           *queue);
+GLIB_FUNC GList*   g_queue_pop_nth_link   (GQueue           *queue,
+				 guint             n);;
+GLIB_FUNC GList*   g_queue_peek_head_link (GQueue           *queue);
+GLIB_FUNC GList*   g_queue_peek_tail_link (GQueue           *queue);
+GLIB_FUNC GList*   g_queue_peek_nth_link  (GQueue           *queue,
+				 guint             n);;
+GLIB_FUNC gint     g_queue_link_index     (GQueue           *queue,
+				 GList            *link_);;
+GLIB_FUNC void     g_queue_unlink         (GQueue           *queue,
+				 GList            *link_);;
+GLIB_FUNC void     g_queue_delete_link    (GQueue           *queue,
+				 GList            *link_);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/grand.h~visibility.patch
+++ glib-2.4.6/glib/grand.h
@@ -42,38 +42,38 @@
  * double_range -> [begin..end)
  */
 
-GRand*  g_rand_new_with_seed  (guint32  seed);
-GRand*  g_rand_new_with_seed_array (const guint32 *seed,
-				    guint seed_length);
-GRand*  g_rand_new            (void);
-void    g_rand_free           (GRand   *rand_);
-GRand*  g_rand_copy           (GRand   *rand_);
-void    g_rand_set_seed       (GRand   *rand_,
-			       guint32  seed);
-void	g_rand_set_seed_array (GRand   *rand_,
+GLIB_FUNC GRand*  g_rand_new_with_seed  (guint32  seed);
+GLIB_FUNC GRand*  g_rand_new_with_seed_array (const guint32 *seed,
+				    guint seed_length);;
+GLIB_FUNC GRand*  g_rand_new            (void);
+GLIB_FUNC void    g_rand_free           (GRand   *rand_);
+GLIB_FUNC GRand*  g_rand_copy           (GRand   *rand_);
+GLIB_FUNC void    g_rand_set_seed       (GRand   *rand_,
+			       guint32  seed);;
+GLIB_FUNC void	g_rand_set_seed_array (GRand   *rand_,
 			       const guint32 *seed,
-			       guint    seed_length);
+			       guint    seed_length);;
 
 #define g_rand_boolean(rand_) ((g_rand_int (rand_) & (1 << 15)) != 0)
 
-guint32 g_rand_int            (GRand   *rand_);
-gint32  g_rand_int_range      (GRand   *rand_,
+GLIB_FUNC guint32 g_rand_int            (GRand   *rand_);
+GLIB_FUNC gint32  g_rand_int_range      (GRand   *rand_,
 			       gint32   begin,
-			       gint32   end);
-gdouble g_rand_double         (GRand   *rand_);
-gdouble g_rand_double_range   (GRand   *rand_,
+			       gint32   end);;
+GLIB_FUNC gdouble g_rand_double         (GRand   *rand_);
+GLIB_FUNC gdouble g_rand_double_range   (GRand   *rand_,
 			       gdouble  begin,
-			       gdouble  end);
-void    g_random_set_seed     (guint32  seed);
+			       gdouble  end);;
+GLIB_FUNC void    g_random_set_seed     (guint32  seed);
 
 #define g_random_boolean() ((g_random_int () & (1 << 15)) != 0)
 
-guint32 g_random_int          (void);
-gint32  g_random_int_range    (gint32   begin,
-			       gint32   end);
-gdouble g_random_double       (void);
-gdouble g_random_double_range (gdouble  begin,
-			       gdouble  end);
+GLIB_FUNC guint32 g_random_int          (void);
+GLIB_FUNC gint32  g_random_int_range    (gint32   begin,
+			       gint32   end);;
+GLIB_FUNC gdouble g_random_double       (void);
+GLIB_FUNC gdouble g_random_double_range (gdouble  begin,
+			       gdouble  end);;
 
 
 G_END_DECLS
--- glib-2.4.6/glib/grel.h~visibility.patch
+++ glib-2.4.6/glib/grel.h
@@ -62,31 +62,31 @@
  * g_relation_count() counts ...
  */
 
-GRelation* g_relation_new     (gint         fields);
-void       g_relation_destroy (GRelation   *relation);
-void       g_relation_index   (GRelation   *relation,
+GLIB_FUNC GRelation* g_relation_new     (gint         fields);
+GLIB_FUNC void       g_relation_destroy (GRelation   *relation);
+GLIB_FUNC void       g_relation_index   (GRelation   *relation,
                                gint         field,
                                GHashFunc    hash_func,
-                               GEqualFunc   key_equal_func);
-void       g_relation_insert  (GRelation   *relation,
-                               ...);
-gint       g_relation_delete  (GRelation   *relation,
+                               GEqualFunc   key_equal_func);;
+GLIB_FUNC void       g_relation_insert  (GRelation   *relation,
+                               ...);;
+GLIB_FUNC gint       g_relation_delete  (GRelation   *relation,
                                gconstpointer  key,
-                               gint         field);
-GTuples*   g_relation_select  (GRelation   *relation,
+                               gint         field);;
+GLIB_FUNC GTuples*   g_relation_select  (GRelation   *relation,
                                gconstpointer  key,
-                               gint         field);
-gint       g_relation_count   (GRelation   *relation,
+                               gint         field);;
+GLIB_FUNC gint       g_relation_count   (GRelation   *relation,
                                gconstpointer  key,
-                               gint         field);
-gboolean   g_relation_exists  (GRelation   *relation,
-                               ...);
-void       g_relation_print   (GRelation   *relation);
+                               gint         field);;
+GLIB_FUNC gboolean   g_relation_exists  (GRelation   *relation,
+                               ...);;
+GLIB_FUNC void       g_relation_print   (GRelation   *relation);
 
-void       g_tuples_destroy   (GTuples     *tuples);
-gpointer   g_tuples_index     (GTuples     *tuples,
+GLIB_FUNC void       g_tuples_destroy   (GTuples     *tuples);
+GLIB_FUNC gpointer   g_tuples_index     (GTuples     *tuples,
                                gint         index_,
-                               gint         field);
+                               gint         field);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gscanner.h~visibility.patch
+++ glib-2.4.6/glib/gscanner.h
@@ -201,52 +201,52 @@
   GScannerMsgFunc	msg_handler;
 };
 
-GScanner*	g_scanner_new			(const GScannerConfig *config_templ);
-void		g_scanner_destroy		(GScanner	*scanner);
-void		g_scanner_input_file		(GScanner	*scanner,
-						 gint		input_fd);
-void		g_scanner_sync_file_offset	(GScanner	*scanner);
-void		g_scanner_input_text		(GScanner	*scanner,
+GLIB_FUNC GScanner*	g_scanner_new			(const GScannerConfig *config_templ);
+GLIB_FUNC void		g_scanner_destroy		(GScanner	*scanner);
+GLIB_FUNC void		g_scanner_input_file		(GScanner	*scanner,
+						 gint		input_fd);;
+GLIB_FUNC void		g_scanner_sync_file_offset	(GScanner	*scanner);
+GLIB_FUNC void		g_scanner_input_text		(GScanner	*scanner,
 						 const	gchar	*text,
-						 guint		text_len);
-GTokenType	g_scanner_get_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_peek_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_cur_token		(GScanner	*scanner);
-GTokenValue	g_scanner_cur_value		(GScanner	*scanner);
-guint		g_scanner_cur_line		(GScanner	*scanner);
-guint		g_scanner_cur_position		(GScanner	*scanner);
-gboolean	g_scanner_eof			(GScanner	*scanner);
-guint		g_scanner_set_scope		(GScanner	*scanner,
-						 guint		 scope_id);
-void		g_scanner_scope_add_symbol	(GScanner	*scanner,
+						 guint		text_len);;
+GLIB_FUNC GTokenType	g_scanner_get_next_token	(GScanner	*scanner);
+GLIB_FUNC GTokenType	g_scanner_peek_next_token	(GScanner	*scanner);
+GLIB_FUNC GTokenType	g_scanner_cur_token		(GScanner	*scanner);
+GLIB_FUNC GTokenValue	g_scanner_cur_value		(GScanner	*scanner);
+GLIB_FUNC guint		g_scanner_cur_line		(GScanner	*scanner);
+GLIB_FUNC guint		g_scanner_cur_position		(GScanner	*scanner);
+GLIB_FUNC gboolean	g_scanner_eof			(GScanner	*scanner);
+GLIB_FUNC guint		g_scanner_set_scope		(GScanner	*scanner,
+						 guint		 scope_id);;
+GLIB_FUNC void		g_scanner_scope_add_symbol	(GScanner	*scanner,
 						 guint		 scope_id,
 						 const gchar	*symbol,
-						 gpointer	value);
-void		g_scanner_scope_remove_symbol	(GScanner	*scanner,
+						 gpointer	value);;
+GLIB_FUNC void		g_scanner_scope_remove_symbol	(GScanner	*scanner,
 						 guint		 scope_id,
-						 const gchar	*symbol);
-gpointer	g_scanner_scope_lookup_symbol	(GScanner	*scanner,
+						 const gchar	*symbol);;
+GLIB_FUNC gpointer	g_scanner_scope_lookup_symbol	(GScanner	*scanner,
 						 guint		 scope_id,
-						 const gchar	*symbol);
-void		g_scanner_scope_foreach_symbol	(GScanner	*scanner,
+						 const gchar	*symbol);;
+GLIB_FUNC void		g_scanner_scope_foreach_symbol	(GScanner	*scanner,
 						 guint		 scope_id,
 						 GHFunc		 func,
-						 gpointer	 user_data);
-gpointer	g_scanner_lookup_symbol		(GScanner	*scanner,
-						 const gchar	*symbol);
-void		g_scanner_unexp_token		(GScanner	*scanner,
+						 gpointer	 user_data);;
+GLIB_FUNC gpointer	g_scanner_lookup_symbol		(GScanner	*scanner,
+						 const gchar	*symbol);;
+GLIB_FUNC void		g_scanner_unexp_token		(GScanner	*scanner,
 						 GTokenType	expected_token,
 						 const gchar	*identifier_spec,
 						 const gchar	*symbol_spec,
 						 const gchar	*symbol_name,
 						 const gchar	*message,
-						 gint		 is_error);
-void		g_scanner_error			(GScanner	*scanner,
+						 gint		 is_error);;
+GLIB_FUNC void		g_scanner_error			(GScanner	*scanner,
 						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
-void		g_scanner_warn			(GScanner	*scanner,
+						 ...) G_GNUC_PRINTF (2,3);;
+GLIB_FUNC void		g_scanner_warn			(GScanner	*scanner,
 						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
+						 ...) G_GNUC_PRINTF (2,3);;
 
 #ifndef G_DISABLE_DEPRECATED
 
--- glib-2.4.6/glib/gshell.h~visibility.patch
+++ glib-2.4.6/glib/gshell.h
@@ -36,15 +36,15 @@
   G_SHELL_ERROR_FAILED
 } GShellError;
 
-GQuark g_shell_error_quark (void);
+GLIB_FUNC GQuark g_shell_error_quark (void);
 
-gchar*   g_shell_quote      (const gchar   *unquoted_string);
-gchar*   g_shell_unquote    (const gchar   *quoted_string,
-                             GError       **error);
-gboolean g_shell_parse_argv (const gchar   *command_line,
+GLIB_FUNC gchar*   g_shell_quote      (const gchar   *unquoted_string);
+GLIB_FUNC gchar*   g_shell_unquote    (const gchar   *quoted_string,
+                             GError       **error);;
+GLIB_FUNC gboolean g_shell_parse_argv (const gchar   *command_line,
                              gint          *argcp,
                              gchar       ***argvp,
-                             GError       **error);
+                             GError       **error);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gslist.h~visibility.patch
+++ glib-2.4.6/glib/gslist.h
@@ -41,59 +41,59 @@
 
 /* Singly linked lists
  */
-void     g_slist_push_allocator (GAllocator       *allocator);
-void     g_slist_pop_allocator  (void);
-GSList*  g_slist_alloc          (void);
-void     g_slist_free           (GSList           *list);
-void     g_slist_free_1         (GSList           *list);
-GSList*  g_slist_append         (GSList           *list,
-				 gpointer          data);
-GSList*  g_slist_prepend        (GSList           *list,
-				 gpointer          data);
-GSList*  g_slist_insert         (GSList           *list,
+GLIB_FUNC void     g_slist_push_allocator (GAllocator       *allocator);
+GLIB_FUNC void     g_slist_pop_allocator  (void);
+GLIB_FUNC GSList*  g_slist_alloc          (void);
+GLIB_FUNC void     g_slist_free           (GSList           *list);
+GLIB_FUNC void     g_slist_free_1         (GSList           *list);
+GLIB_FUNC GSList*  g_slist_append         (GSList           *list,
+				 gpointer          data);;
+GLIB_FUNC GSList*  g_slist_prepend        (GSList           *list,
+				 gpointer          data);;
+GLIB_FUNC GSList*  g_slist_insert         (GSList           *list,
 				 gpointer          data,
-				 gint              position);
-GSList*  g_slist_insert_sorted  (GSList           *list,
+				 gint              position);;
+GLIB_FUNC GSList*  g_slist_insert_sorted  (GSList           *list,
 				 gpointer          data,
-				 GCompareFunc      func);
-GSList*  g_slist_insert_before  (GSList           *slist,
+				 GCompareFunc      func);;
+GLIB_FUNC GSList*  g_slist_insert_before  (GSList           *slist,
 				 GSList           *sibling,
-				 gpointer          data);
-GSList*  g_slist_concat         (GSList           *list1,
-				 GSList           *list2);
-GSList*  g_slist_remove         (GSList           *list,
-				 gconstpointer     data);
-GSList*  g_slist_remove_all     (GSList           *list,
-				 gconstpointer     data);
-GSList*  g_slist_remove_link    (GSList           *list,
-				 GSList           *link_);
-GSList*  g_slist_delete_link    (GSList           *list,
-				 GSList           *link_);
-GSList*  g_slist_reverse        (GSList           *list);
-GSList*  g_slist_copy           (GSList           *list);
-GSList*  g_slist_nth            (GSList           *list,
-				 guint             n);
-GSList*  g_slist_find           (GSList           *list,
-				 gconstpointer     data);
-GSList*  g_slist_find_custom    (GSList           *list,
+				 gpointer          data);;
+GLIB_FUNC GSList*  g_slist_concat         (GSList           *list1,
+				 GSList           *list2);;
+GLIB_FUNC GSList*  g_slist_remove         (GSList           *list,
+				 gconstpointer     data);;
+GLIB_FUNC GSList*  g_slist_remove_all     (GSList           *list,
+				 gconstpointer     data);;
+GLIB_FUNC GSList*  g_slist_remove_link    (GSList           *list,
+				 GSList           *link_);;
+GLIB_FUNC GSList*  g_slist_delete_link    (GSList           *list,
+				 GSList           *link_);;
+GLIB_FUNC GSList*  g_slist_reverse        (GSList           *list);
+GLIB_FUNC GSList*  g_slist_copy           (GSList           *list);
+GLIB_FUNC GSList*  g_slist_nth            (GSList           *list,
+				 guint             n);;
+GLIB_FUNC GSList*  g_slist_find           (GSList           *list,
+				 gconstpointer     data);;
+GLIB_FUNC GSList*  g_slist_find_custom    (GSList           *list,
 				 gconstpointer     data,
-				 GCompareFunc      func);
-gint     g_slist_position       (GSList           *list,
-				 GSList           *llink);
-gint     g_slist_index          (GSList           *list,
-				 gconstpointer     data);
-GSList*  g_slist_last           (GSList           *list);
-guint    g_slist_length         (GSList           *list);
-void     g_slist_foreach        (GSList           *list,
+				 GCompareFunc      func);;
+GLIB_FUNC gint     g_slist_position       (GSList           *list,
+				 GSList           *llink);;
+GLIB_FUNC gint     g_slist_index          (GSList           *list,
+				 gconstpointer     data);;
+GLIB_FUNC GSList*  g_slist_last           (GSList           *list);
+GLIB_FUNC guint    g_slist_length         (GSList           *list);
+GLIB_FUNC void     g_slist_foreach        (GSList           *list,
 				 GFunc             func,
-				 gpointer          user_data);
-GSList*  g_slist_sort           (GSList           *list,
-				 GCompareFunc      compare_func);
-GSList*  g_slist_sort_with_data (GSList           *list,
+				 gpointer          user_data);;
+GLIB_FUNC GSList*  g_slist_sort           (GSList           *list,
+				 GCompareFunc      compare_func);;
+GLIB_FUNC GSList*  g_slist_sort_with_data (GSList           *list,
 				 GCompareDataFunc  compare_func,
-				 gpointer          user_data);
-gpointer g_slist_nth_data       (GSList           *list,
-				 guint             n);
+				 gpointer          user_data);;
+GLIB_FUNC gpointer g_slist_nth_data       (GSList           *list,
+				 guint             n);;
 #define  g_slist_next(slist)	((slist) ? (((GSList *)(slist))->next) : NULL)
 
 G_END_DECLS
--- glib-2.4.6/glib/gspawn.h~visibility.patch
+++ glib-2.4.6/glib/gspawn.h
@@ -69,22 +69,22 @@
   G_SPAWN_FILE_AND_ARGV_ZERO     = 1 << 6
 } GSpawnFlags;
 
-GQuark g_spawn_error_quark (void);
+GLIB_FUNC GQuark g_spawn_error_quark (void);
 
-gboolean g_spawn_async (const gchar           *working_directory,
+GLIB_FUNC gboolean g_spawn_async (const gchar           *working_directory,
                         gchar                **argv,
                         gchar                **envp,
                         GSpawnFlags            flags,
                         GSpawnChildSetupFunc   child_setup,
                         gpointer               user_data,
                         GPid                  *child_pid,
-                        GError               **error);
+                        GError               **error);;
 
 
 /* Opens pipes for non-NULL standard_output, standard_input, standard_error,
  * and returns the parent's end of the pipes.
  */
-gboolean g_spawn_async_with_pipes (const gchar          *working_directory,
+GLIB_FUNC gboolean g_spawn_async_with_pipes (const gchar          *working_directory,
                                    gchar               **argv,
                                    gchar               **envp,
                                    GSpawnFlags           flags,
@@ -94,14 +94,14 @@
                                    gint                 *standard_input,
                                    gint                 *standard_output,
                                    gint                 *standard_error,
-                                   GError              **error);
+                                   GError              **error);;
 
 
 /* If standard_output or standard_error are non-NULL, the full
  * standard output or error of the command will be placed there.
  */
 
-gboolean g_spawn_sync         (const gchar          *working_directory,
+GLIB_FUNC gboolean g_spawn_sync         (const gchar          *working_directory,
                                gchar               **argv,
                                gchar               **envp,
                                GSpawnFlags           flags,
@@ -110,17 +110,17 @@
                                gchar               **standard_output,
                                gchar               **standard_error,
                                gint                 *exit_status,
-                               GError              **error);
+                               GError              **error);;
 
-gboolean g_spawn_command_line_sync  (const gchar          *command_line,
+GLIB_FUNC gboolean g_spawn_command_line_sync  (const gchar          *command_line,
                                      gchar               **standard_output,
                                      gchar               **standard_error,
                                      gint                 *exit_status,
-                                     GError              **error);
-gboolean g_spawn_command_line_async (const gchar          *command_line,
-                                     GError              **error);
+                                     GError              **error);;
+GLIB_FUNC gboolean g_spawn_command_line_async (const gchar          *command_line,
+                                     GError              **error);;
 
-void g_spawn_close_pid (GPid pid);
+GLIB_FUNC void g_spawn_close_pid (GPid pid);
 
 
 G_END_DECLS
--- glib-2.4.6/glib/gstrfuncs.h~visibility.patch
+++ glib-2.4.6/glib/gstrfuncs.h
@@ -82,82 +82,82 @@
 #define g_ascii_isxdigit(c) \
   ((g_ascii_table[(guchar) (c)] & G_ASCII_XDIGIT) != 0)
 
-gchar                 g_ascii_tolower  (gchar        c) G_GNUC_CONST;
-gchar                 g_ascii_toupper  (gchar        c) G_GNUC_CONST;
+GLIB_FUNC gchar                 g_ascii_tolower  (gchar        c) G_GNUC_CONST;;
+GLIB_FUNC gchar                 g_ascii_toupper  (gchar        c) G_GNUC_CONST;;
 
-gint                  g_ascii_digit_value  (gchar    c) G_GNUC_CONST;
-gint                  g_ascii_xdigit_value (gchar    c) G_GNUC_CONST;
+GLIB_FUNC gint                  g_ascii_digit_value  (gchar    c) G_GNUC_CONST;;
+GLIB_FUNC gint                  g_ascii_xdigit_value (gchar    c) G_GNUC_CONST;;
 
 /* String utility functions that modify a string argument or
  * return a constant string that must not be freed.
  */
 #define	 G_STR_DELIMITERS	"_-|> <."
-gchar*	              g_strdelimit     (gchar	     *string,
+GLIB_FUNC gchar*	              g_strdelimit     (gchar	     *string,
 					const gchar  *delimiters,
-					gchar	      new_delimiter);
-gchar*	              g_strcanon       (gchar        *string,
+					gchar	      new_delimiter);;
+GLIB_FUNC gchar*	              g_strcanon       (gchar        *string,
 					const gchar  *valid_chars,
-					gchar         substitutor);
-G_CONST_RETURN gchar* g_strerror       (gint	      errnum) G_GNUC_CONST;
-G_CONST_RETURN gchar* g_strsignal      (gint	      signum) G_GNUC_CONST;
-gchar*	              g_strreverse     (gchar	     *string);
-gsize	              g_strlcpy	       (gchar	     *dest,
+					gchar         substitutor);;
+GLIB_FUNC G_CONST_RETURN gchar* g_strerror       (gint	      errnum) G_GNUC_CONST;
+GLIB_FUNC G_CONST_RETURN gchar* g_strsignal      (gint	      signum) G_GNUC_CONST;
+GLIB_FUNC gchar*	              g_strreverse     (gchar	     *string);
+GLIB_FUNC gsize	              g_strlcpy	       (gchar	     *dest,
 					const gchar  *src,
-					gsize         dest_size);
-gsize	              g_strlcat        (gchar	     *dest,
+					gsize         dest_size);;
+GLIB_FUNC gsize	              g_strlcat        (gchar	     *dest,
 					const gchar  *src,
-					gsize         dest_size);
-gchar *               g_strstr_len     (const gchar  *haystack,
+					gsize         dest_size);;
+GLIB_FUNC gchar *               g_strstr_len     (const gchar  *haystack,
 					gssize        haystack_len,
-					const gchar  *needle);
-gchar *               g_strrstr        (const gchar  *haystack,
-					const gchar  *needle);
-gchar *               g_strrstr_len    (const gchar  *haystack,
+					const gchar  *needle);;
+GLIB_FUNC gchar *               g_strrstr        (const gchar  *haystack,
+					const gchar  *needle);;
+GLIB_FUNC gchar *               g_strrstr_len    (const gchar  *haystack,
 					gssize        haystack_len,
-					const gchar  *needle);
+					const gchar  *needle);;
 
-gboolean              g_str_has_suffix (const gchar  *str,
-					const gchar  *suffix);
-gboolean              g_str_has_prefix (const gchar  *str,
-					const gchar  *prefix);
+GLIB_FUNC gboolean              g_str_has_suffix (const gchar  *str,
+					const gchar  *suffix);;
+GLIB_FUNC gboolean              g_str_has_prefix (const gchar  *str,
+					const gchar  *prefix);;
 
 /* String to/from double conversion functions */
 
-gdouble	              g_strtod         (const gchar  *nptr,
-					gchar	    **endptr);
-gdouble	              g_ascii_strtod   (const gchar  *nptr,
-					gchar	    **endptr);
-guint64		      g_ascii_strtoull (const gchar *nptr,
+GLIB_FUNC gdouble	              g_strtod         (const gchar  *nptr,
+					gchar	    **endptr);;
+GLIB_FUNC gdouble	              g_ascii_strtod   (const gchar  *nptr,
+					gchar	    **endptr);;
+GLIB_FUNC guint64		      g_ascii_strtoull (const gchar *nptr,
 					gchar      **endptr,
-					guint        base);
+					guint        base);;
 /* 29 bytes should enough for all possible values that
  * g_ascii_dtostr can produce.
  * Then add 10 for good measure */
 #define G_ASCII_DTOSTR_BUF_SIZE (29 + 10)
-gchar *               g_ascii_dtostr   (gchar        *buffer,
+GLIB_FUNC gchar *               g_ascii_dtostr   (gchar        *buffer,
 					gint          buf_len,
-					gdouble       d);
-gchar *               g_ascii_formatd  (gchar        *buffer,
+					gdouble       d);;
+GLIB_FUNC gchar *               g_ascii_formatd  (gchar        *buffer,
 					gint          buf_len,
 					const gchar  *format,
-					gdouble       d);
+					gdouble       d);;
 
 /* removes leading spaces */
-gchar*                g_strchug        (gchar        *string);
+GLIB_FUNC gchar*                g_strchug        (gchar        *string);
 /* removes trailing spaces */
-gchar*                g_strchomp       (gchar        *string);
+GLIB_FUNC gchar*                g_strchomp       (gchar        *string);
 /* removes leading & trailing spaces */
 #define g_strstrip( string )	g_strchomp (g_strchug (string))
 
-gint                  g_ascii_strcasecmp  (const gchar *s1,
-					   const gchar *s2);
-gint                  g_ascii_strncasecmp (const gchar *s1,
+GLIB_FUNC gint                  g_ascii_strcasecmp  (const gchar *s1,
+					   const gchar *s2);;
+GLIB_FUNC gint                  g_ascii_strncasecmp (const gchar *s1,
 					   const gchar *s2,
-					   gsize        n);
-gchar*                g_ascii_strdown     (const gchar *str,
-					   gssize       len);
-gchar*                g_ascii_strup       (const gchar *str,
-					   gssize       len);
+					   gsize        n);;
+GLIB_FUNC gchar*                g_ascii_strdown     (const gchar *str,
+					   gssize       len);;
+GLIB_FUNC gchar*                g_ascii_strup       (const gchar *str,
+					   gssize       len);;
 
 #ifndef G_DISABLE_DEPRECATED
 
@@ -166,37 +166,37 @@
  * toupper, which is almost never the right thing.
  */
 
-gint	              g_strcasecmp     (const gchar *s1,
-					const gchar *s2);
-gint	              g_strncasecmp    (const gchar *s1,
+GLIB_FUNC gint	              g_strcasecmp     (const gchar *s1,
+					const gchar *s2);;
+GLIB_FUNC gint	              g_strncasecmp    (const gchar *s1,
 					const gchar *s2,
-					guint        n);
-gchar*	              g_strdown	       (gchar	     *string);
-gchar*	              g_strup	       (gchar	     *string);
+					guint        n);;
+GLIB_FUNC gchar*	              g_strdown	       (gchar	     *string);
+GLIB_FUNC gchar*	              g_strup	       (gchar	     *string);
 
 #endif /* G_DISABLE_DEPRECATED */
 
 /* String utility functions that return a newly allocated string which
  * ought to be freed with g_free from the caller at some point.
  */
-gchar*	              g_strdup	       (const gchar *str);
-gchar*	              g_strdup_printf  (const gchar *format,
-					...) G_GNUC_PRINTF (1, 2);
-gchar*	              g_strdup_vprintf (const gchar *format,
-					va_list      args);
-gchar*	              g_strndup	       (const gchar *str,
-					gsize        n);  
-gchar*	              g_strnfill       (gsize        length,  
-					gchar        fill_char);
-gchar*	              g_strconcat      (const gchar *string1,
-					...); /* NULL terminated */
-gchar*                g_strjoin	       (const gchar  *separator,
-					...); /* NULL terminated */
+GLIB_FUNC gchar*	              g_strdup	       (const gchar *str);
+GLIB_FUNC gchar*	              g_strdup_printf  (const gchar *format,
+					...) G_GNUC_PRINTF (1, 2);;
+GLIB_FUNC gchar*	              g_strdup_vprintf (const gchar *format,
+					va_list      args);;
+GLIB_FUNC gchar*	              g_strndup	       (const gchar *str,
+					gsize        n);;  
+GLIB_FUNC gchar*	              g_strnfill       (gsize        length,  
+					gchar        fill_char);;
+GLIB_FUNC gchar*	              g_strconcat      (const gchar *string1,
+					...);; /* NULL terminated */
+GLIB_FUNC gchar*                g_strjoin	       (const gchar  *separator,
+					...);; /* NULL terminated */
 /* Make a copy of a string interpreting C string -style escape
  * sequences. Inverse of g_strescape. The recognized sequences are \b
  * \f \n \r \t \\ \" and the octal format.
  */
-gchar*                g_strcompress    (const gchar *source);
+GLIB_FUNC gchar*                g_strcompress    (const gchar *source);
 
 /* Copy a string escaping nonprintable characters like in C strings.
  * Inverse of g_strcompress. The exceptions parameter, if non-NULL, points
@@ -206,11 +206,11 @@
  * Luckily this function wasn't used much, using NULL as second parameter
  * provides mostly identical semantics.
  */
-gchar*                g_strescape      (const gchar *source,
-					const gchar *exceptions);
+GLIB_FUNC gchar*                g_strescape      (const gchar *source,
+					const gchar *exceptions);;
 
-gpointer              g_memdup	       (gconstpointer mem,
-					guint	       byte_size);
+GLIB_FUNC gpointer              g_memdup	       (gconstpointer mem,
+					guint	       byte_size);;
 
 /* NULL terminated string arrays.
  * g_strsplit(), g_strsplit_set() split up string into max_tokens tokens
@@ -220,21 +220,21 @@
  * g_strfreev() frees the array itself and all of its strings.
  * g_strdupv() copies a NULL-terminated array of strings
  */
-gchar**	              g_strsplit       (const gchar  *string,
+GLIB_FUNC gchar**	              g_strsplit       (const gchar  *string,
 					const gchar  *delimiter,
-					gint          max_tokens);
-gchar **	      g_strsplit_set   (const gchar *string,
+					gint          max_tokens);;
+GLIB_FUNC gchar **	      g_strsplit_set   (const gchar *string,
 					const gchar *delimiters,
-					gint         max_tokens);
-gchar*                g_strjoinv       (const gchar  *separator,
-					gchar       **str_array);
-void                  g_strfreev       (gchar       **str_array);
-gchar**               g_strdupv        (gchar       **str_array);
+					gint         max_tokens);;
+GLIB_FUNC gchar*                g_strjoinv       (const gchar  *separator,
+					gchar       **str_array);;
+GLIB_FUNC void                  g_strfreev       (gchar       **str_array);
+GLIB_FUNC gchar**               g_strdupv        (gchar       **str_array);
 
-gchar*                g_stpcpy         (gchar        *dest,
-                                        const char   *src);
+GLIB_FUNC gchar*                g_stpcpy         (gchar        *dest,
+                                        const char   *src);;
 
-G_CONST_RETURN gchar *g_strip_context  (const gchar *msgid, 
+GLIB_FUNC G_CONST_RETURN gchar *g_strip_context  (const gchar *msgid, 
 					const gchar *msgval);
 
 G_END_DECLS
--- glib-2.4.6/glib/gstring.h~visibility.patch
+++ glib-2.4.6/glib/gstring.h
@@ -45,76 +45,76 @@
 
 /* String Chunks
  */
-GStringChunk* g_string_chunk_new	   (gsize size);  
-void	      g_string_chunk_free	   (GStringChunk *chunk);
-gchar*	      g_string_chunk_insert	   (GStringChunk *chunk,
-					    const gchar	 *string);
-gchar*	      g_string_chunk_insert_len	   (GStringChunk *chunk,
+GLIB_FUNC GStringChunk* g_string_chunk_new	   (gsize size);  
+GLIB_FUNC void	      g_string_chunk_free	   (GStringChunk *chunk);
+GLIB_FUNC gchar*	      g_string_chunk_insert	   (GStringChunk *chunk,
+					    const gchar	 *string);;
+GLIB_FUNC gchar*	      g_string_chunk_insert_len	   (GStringChunk *chunk,
 					    const gchar	 *string,
-					    gssize        len);
-gchar*	      g_string_chunk_insert_const  (GStringChunk *chunk,
-					    const gchar	 *string);
+					    gssize        len);;
+GLIB_FUNC gchar*	      g_string_chunk_insert_const  (GStringChunk *chunk,
+					    const gchar	 *string);;
 
 
 /* Strings
  */
-GString*     g_string_new	        (const gchar	 *init);
-GString*     g_string_new_len           (const gchar     *init,
-                                         gssize           len);   
-GString*     g_string_sized_new         (gsize            dfl_size);  
-gchar*	     g_string_free	        (GString	 *string,
-					 gboolean	  free_segment);
-gboolean     g_string_equal             (const GString	 *v,
-					 const GString 	 *v2);
-guint        g_string_hash              (const GString   *str);
-GString*     g_string_assign            (GString	 *string,
-					 const gchar	 *rval);
-GString*     g_string_truncate          (GString	 *string,
-					 gsize		  len);    
-GString*     g_string_set_size          (GString         *string,
-					 gsize            len);
-GString*     g_string_insert_len        (GString         *string,
+GLIB_FUNC GString*     g_string_new	        (const gchar	 *init);
+GLIB_FUNC GString*     g_string_new_len           (const gchar     *init,
+                                         gssize           len);;   
+GLIB_FUNC GString*     g_string_sized_new         (gsize            dfl_size);  
+GLIB_FUNC gchar*	     g_string_free	        (GString	 *string,
+					 gboolean	  free_segment);;
+GLIB_FUNC gboolean     g_string_equal             (const GString	 *v,
+					 const GString 	 *v2);;
+GLIB_FUNC guint        g_string_hash              (const GString   *str);
+GLIB_FUNC GString*     g_string_assign            (GString	 *string,
+					 const gchar	 *rval);;
+GLIB_FUNC GString*     g_string_truncate          (GString	 *string,
+					 gsize		  len);;    
+GLIB_FUNC GString*     g_string_set_size          (GString         *string,
+					 gsize            len);;
+GLIB_FUNC GString*     g_string_insert_len        (GString         *string,
                                          gssize           pos,   
                                          const gchar     *val,
-                                         gssize           len);  
-GString*     g_string_append            (GString	 *string,
-			                 const gchar	 *val);
-GString*     g_string_append_len        (GString	 *string,
+                                         gssize           len);;  
+GLIB_FUNC GString*     g_string_append            (GString	 *string,
+			                 const gchar	 *val);;
+GLIB_FUNC GString*     g_string_append_len        (GString	 *string,
 			                 const gchar	 *val,
-                                         gssize           len);  
-GString*     g_string_append_c          (GString	 *string,
-					 gchar		  c);
-GString*     g_string_append_unichar    (GString	 *string,
-					 gunichar	  wc);
-GString*     g_string_prepend           (GString	 *string,
-					 const gchar	 *val);
-GString*     g_string_prepend_c         (GString	 *string,
-					 gchar		  c);
-GString*     g_string_prepend_unichar   (GString	 *string,
-					 gunichar	  wc);
-GString*     g_string_prepend_len       (GString	 *string,
+                                         gssize           len);;  
+GLIB_FUNC GString*     g_string_append_c          (GString	 *string,
+					 gchar		  c);;
+GLIB_FUNC GString*     g_string_append_unichar    (GString	 *string,
+					 gunichar	  wc);;
+GLIB_FUNC GString*     g_string_prepend           (GString	 *string,
+					 const gchar	 *val);;
+GLIB_FUNC GString*     g_string_prepend_c         (GString	 *string,
+					 gchar		  c);;
+GLIB_FUNC GString*     g_string_prepend_unichar   (GString	 *string,
+					 gunichar	  wc);;
+GLIB_FUNC GString*     g_string_prepend_len       (GString	 *string,
 			                 const gchar	 *val,
-                                         gssize           len);  
-GString*     g_string_insert            (GString	 *string,
+                                         gssize           len);;  
+GLIB_FUNC GString*     g_string_insert            (GString	 *string,
 					 gssize		  pos,    
-					 const gchar	 *val);
-GString*     g_string_insert_c          (GString	 *string,
+					 const gchar	 *val);;
+GLIB_FUNC GString*     g_string_insert_c          (GString	 *string,
 					 gssize		  pos,    
-					 gchar		  c);
-GString*     g_string_insert_unichar    (GString	 *string,
+					 gchar		  c);;
+GLIB_FUNC GString*     g_string_insert_unichar    (GString	 *string,
 					 gssize		  pos,    
-					 gunichar	  wc);
-GString*     g_string_erase	        (GString	 *string,
+					 gunichar	  wc);;
+GLIB_FUNC GString*     g_string_erase	        (GString	 *string,
 					 gssize		  pos,
-					 gssize		  len);
-GString*     g_string_ascii_down        (GString	 *string);
-GString*     g_string_ascii_up          (GString	 *string);
-void         g_string_printf            (GString	 *string,
+					 gssize		  len);;
+GLIB_FUNC GString*     g_string_ascii_down        (GString	 *string);
+GLIB_FUNC GString*     g_string_ascii_up          (GString	 *string);
+GLIB_FUNC void         g_string_printf            (GString	 *string,
 					 const gchar	 *format,
-					 ...) G_GNUC_PRINTF (2, 3);
-void         g_string_append_printf     (GString	 *string,
+					 ...) G_GNUC_PRINTF (2, 3);;
+GLIB_FUNC void         g_string_append_printf     (GString	 *string,
 					 const gchar	 *format,
-					 ...) G_GNUC_PRINTF (2, 3);
+					 ...) G_GNUC_PRINTF (2, 3);;
 
 /* -- optimize g_strig_append_c --- */
 #ifdef G_CAN_INLINE
@@ -127,8 +127,8 @@
       gstring->str[gstring->len++] = c;
       gstring->str[gstring->len] = 0;
     }
-  else
-    g_string_insert_c (gstring, -1, c);
+else
+    g_string_insert_c (gstring, -1, c);;;;
   return gstring;
 }
 #define g_string_append_c(gstr,c)       g_string_append_c_inline (gstr, c)
@@ -142,8 +142,8 @@
  * toupper, which is almost never the right thing.
  */
 
-GString*     g_string_down              (GString	 *string);
-GString*     g_string_up                (GString	 *string);
+GLIB_FUNC GString*     g_string_down              (GString	 *string);
+GLIB_FUNC GString*     g_string_up                (GString	 *string);
 
 /* These aliases are included for compatibility. */
 #define	g_string_sprintf	g_string_printf
--- glib-2.4.6/glib/gthread.h~visibility.patch
+++ glib-2.4.6/glib/gthread.h
@@ -36,7 +36,7 @@
 /* GLib Thread support
  */
 
-extern GQuark g_thread_error_quark (void);
+GLIB_FUNC extern GQuark g_thread_error_quark (void);
 #define G_THREAD_ERROR g_thread_error_quark ()
 
 typedef enum
@@ -116,7 +116,7 @@
  * only be called once, and must not be called directly or indirectly
  * from another glib-function, e.g. as a callback.
  */
-void    g_thread_init   (GThreadFunctions       *vtable);
+GLIB_FUNC void    g_thread_init   (GThreadFunctions       *vtable);
 
 /* Errorcheck mutexes. If you define G_ERRORCHECK_MUTEXES, then all
  * mutexes will check for re-locking and re-unlocking */
@@ -125,7 +125,7 @@
  * NULL. Do not call directly. Use #define G_ERRORCHECK_MUTEXES
  * instead.
  */
-void    g_thread_init_with_errorcheck_mutexes (GThreadFunctions* vtable);
+GLIB_FUNC void    g_thread_init_with_errorcheck_mutexes (GThreadFunctions* vtable);
 
 /* A random number to recognize debug calls to g_mutex_... */
 #define G_MUTEX_DEBUG_MAGIC 0xf8e18ad7
@@ -135,7 +135,7 @@
 #endif
 
 /* internal function for fallback static mutex implementation */
-GMutex* g_static_mutex_get_mutex_impl   (GMutex **mutex);
+GLIB_FUNC GMutex* g_static_mutex_get_mutex_impl   (GMutex **mutex);
 
 #define g_static_mutex_get_mutex_impl_shortcut(mutex) \
   (g_atomic_pointer_get ((gpointer*)mutex) ? *(mutex) : \
@@ -205,19 +205,19 @@
   (g_thread_create_full (func, data, 0, joinable, FALSE, 		\
                          G_THREAD_PRIORITY_NORMAL, error))
 
-GThread* g_thread_create_full  (GThreadFunc            func,
+GLIB_FUNC GThread* g_thread_create_full  (GThreadFunc            func,
                                 gpointer               data,
                                 gulong                 stack_size,
                                 gboolean               joinable,
                                 gboolean               bound,
                                 GThreadPriority        priority,
-                                GError               **error);
-GThread* g_thread_self         (void);
-void     g_thread_exit         (gpointer               retval);
-gpointer g_thread_join         (GThread               *thread);
+                                GError               **error);;
+GLIB_FUNC GThread* g_thread_self         (void);
+GLIB_FUNC void     g_thread_exit         (gpointer               retval);
+GLIB_FUNC gpointer g_thread_join         (GThread               *thread);
 
-void     g_thread_set_priority (GThread               *thread,
-                                GThreadPriority        priority);
+GLIB_FUNC void     g_thread_set_priority (GThread               *thread,
+                                GThreadPriority        priority);;
 
 /* GStaticMutexes can be statically initialized with the value
  * G_STATIC_MUTEX_INIT, and then they can directly be used, that is
@@ -230,8 +230,8 @@
     g_mutex_trylock (g_static_mutex_get_mutex (mutex))
 #define g_static_mutex_unlock(mutex) \
     g_mutex_unlock (g_static_mutex_get_mutex (mutex))
-void g_static_mutex_init (GStaticMutex *mutex);
-void g_static_mutex_free (GStaticMutex *mutex);
+GLIB_FUNC void g_static_mutex_init (GStaticMutex *mutex);
+GLIB_FUNC void g_static_mutex_free (GStaticMutex *mutex);
 
 struct _GStaticPrivate
 {
@@ -239,12 +239,12 @@
   guint index;
 };
 #define G_STATIC_PRIVATE_INIT { 0 }
-void     g_static_private_init           (GStaticPrivate   *private_key);
-gpointer g_static_private_get            (GStaticPrivate   *private_key);
-void     g_static_private_set            (GStaticPrivate   *private_key,
+GLIB_FUNC void     g_static_private_init           (GStaticPrivate   *private_key);
+GLIB_FUNC gpointer g_static_private_get            (GStaticPrivate   *private_key);
+GLIB_FUNC void     g_static_private_set            (GStaticPrivate   *private_key,
 					  gpointer          data,
-					  GDestroyNotify    notify);
-void     g_static_private_free           (GStaticPrivate   *private_key);
+					  GDestroyNotify    notify);;
+GLIB_FUNC void     g_static_private_free           (GStaticPrivate   *private_key);
 
 typedef struct _GStaticRecMutex GStaticRecMutex;
 struct _GStaticRecMutex
@@ -256,14 +256,14 @@
 };
 
 #define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
-void     g_static_rec_mutex_init        (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_lock        (GStaticRecMutex *mutex);
-gboolean g_static_rec_mutex_trylock     (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_unlock      (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_lock_full   (GStaticRecMutex *mutex,
-                                         guint            depth);
-guint    g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_free        (GStaticRecMutex *mutex);
+GLIB_FUNC void     g_static_rec_mutex_init        (GStaticRecMutex *mutex);
+GLIB_FUNC void     g_static_rec_mutex_lock        (GStaticRecMutex *mutex);
+GLIB_FUNC gboolean g_static_rec_mutex_trylock     (GStaticRecMutex *mutex);
+GLIB_FUNC void     g_static_rec_mutex_unlock      (GStaticRecMutex *mutex);
+GLIB_FUNC void     g_static_rec_mutex_lock_full   (GStaticRecMutex *mutex,
+                                         guint            depth);;
+GLIB_FUNC guint    g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex);
+GLIB_FUNC void     g_static_rec_mutex_free        (GStaticRecMutex *mutex);
 
 typedef struct _GStaticRWLock GStaticRWLock;
 struct _GStaticRWLock
@@ -280,14 +280,14 @@
 
 #define G_STATIC_RW_LOCK_INIT { G_STATIC_MUTEX_INIT, NULL, NULL, 0, FALSE, 0, 0 }
 
-void      g_static_rw_lock_init           (GStaticRWLock* lock);
-void      g_static_rw_lock_reader_lock    (GStaticRWLock* lock);
-gboolean  g_static_rw_lock_reader_trylock (GStaticRWLock* lock);
-void      g_static_rw_lock_reader_unlock  (GStaticRWLock* lock);
-void      g_static_rw_lock_writer_lock    (GStaticRWLock* lock);
-gboolean  g_static_rw_lock_writer_trylock (GStaticRWLock* lock);
-void      g_static_rw_lock_writer_unlock  (GStaticRWLock* lock);
-void      g_static_rw_lock_free           (GStaticRWLock* lock);
+GLIB_FUNC void      g_static_rw_lock_init           (GStaticRWLock* lock);
+GLIB_FUNC void      g_static_rw_lock_reader_lock    (GStaticRWLock* lock);
+GLIB_FUNC gboolean  g_static_rw_lock_reader_trylock (GStaticRWLock* lock);
+GLIB_FUNC void      g_static_rw_lock_reader_unlock  (GStaticRWLock* lock);
+GLIB_FUNC void      g_static_rw_lock_writer_lock    (GStaticRWLock* lock);
+GLIB_FUNC gboolean  g_static_rw_lock_writer_trylock (GStaticRWLock* lock);
+GLIB_FUNC void      g_static_rw_lock_writer_unlock  (GStaticRWLock* lock);
+GLIB_FUNC void      g_static_rw_lock_free           (GStaticRWLock* lock);
 
 typedef enum
 {
@@ -305,7 +305,7 @@
 
 #define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL }
 
-gpointer g_once_impl (GOnce *once, GThreadFunc func, gpointer arg);
+GLIB_FUNC gpointer g_once_impl (GOnce *once, GThreadFunc func, gpointer arg);
 
 #ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
 # define g_once(once, func, arg) g_once_impl ((once), (func), (arg))
--- glib-2.4.6/glib/gthreadinit.h~visibility.patch
+++ glib-2.4.6/glib/gthreadinit.h
@@ -24,7 +24,7 @@
 G_BEGIN_DECLS
 
 /* Is called from gthread/gthread-impl.c */
-void g_thread_init_glib (void);
+GLIB_FUNC void g_thread_init_glib (void);
 
 /* Are called from glib/gthread.c. May not contain g_private_new calls */
 void _g_mem_thread_init (void);
--- glib-2.4.6/glib/gthreadpool.h~visibility.patch
+++ glib-2.4.6/glib/gthreadpool.h
@@ -50,51 +50,51 @@
  * means, that the threads shouldn't be shared and that they will be
  * prestarted (otherwise they are started as needed) user_data is the
  * 2nd argument to the func */
-GThreadPool*    g_thread_pool_new             (GFunc            func,
+GLIB_FUNC GThreadPool*    g_thread_pool_new             (GFunc            func,
                                                gpointer         user_data,
                                                gint             max_threads,
                                                gboolean         exclusive,
-                                               GError         **error);
+                                               GError         **error);;
 
 /* Push new data into the thread pool. This task is assigned to a thread later
  * (when the maximal number of threads is reached for that pool) or now
  * (otherwise). If necessary a new thread will be started. The function
  * returns immediatly */
-void            g_thread_pool_push            (GThreadPool     *pool,
+GLIB_FUNC void            g_thread_pool_push            (GThreadPool     *pool,
                                                gpointer         data,
-                                               GError         **error);
+                                               GError         **error);;
 
 /* Set the number of threads, which can run concurrently for that pool, -1
  * means no limit. 0 means has the effect, that the pool won't process
  * requests until the limit is set higher again */
-void            g_thread_pool_set_max_threads (GThreadPool     *pool,
+GLIB_FUNC void            g_thread_pool_set_max_threads (GThreadPool     *pool,
                                                gint             max_threads,
-                                               GError         **error);
-gint            g_thread_pool_get_max_threads (GThreadPool     *pool);
+                                               GError         **error);;
+GLIB_FUNC gint            g_thread_pool_get_max_threads (GThreadPool     *pool);
 
 /* Get the number of threads assigned to that pool. This number doesn't
  * necessarily represent the number of working threads in that pool */
-guint           g_thread_pool_get_num_threads (GThreadPool     *pool);
+GLIB_FUNC guint           g_thread_pool_get_num_threads (GThreadPool     *pool);
 
 /* Get the number of unprocessed items in the pool */
-guint           g_thread_pool_unprocessed     (GThreadPool     *pool);
+GLIB_FUNC guint           g_thread_pool_unprocessed     (GThreadPool     *pool);
 
 /* Free the pool, immediate means, that all unprocessed items in the queue
  * wont be processed, wait means, that the function doesn't return immediatly,
  * but after all threads in the pool are ready processing items. immediate
  * does however not mean, that threads are killed. */
-void            g_thread_pool_free            (GThreadPool     *pool,
+GLIB_FUNC void            g_thread_pool_free            (GThreadPool     *pool,
                                                gboolean         immediate,
-                                               gboolean         wait);
+                                               gboolean         wait);;
 
 /* Set the maximal number of unused threads before threads will be stopped by
  * GLib, -1 means no limit */
-void            g_thread_pool_set_max_unused_threads (gint      max_threads);
-gint            g_thread_pool_get_max_unused_threads (void);
-guint           g_thread_pool_get_num_unused_threads (void);
+GLIB_FUNC void            g_thread_pool_set_max_unused_threads (gint      max_threads);
+GLIB_FUNC gint            g_thread_pool_get_max_unused_threads (void);
+GLIB_FUNC guint           g_thread_pool_get_num_unused_threads (void);
 
 /* Stop all currently unused threads, but leave the limit untouched */
-void            g_thread_pool_stop_unused_threads    (void);
+GLIB_FUNC void            g_thread_pool_stop_unused_threads    (void);
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gtimer.h~visibility.patch
+++ glib-2.4.6/glib/gtimer.h
@@ -39,19 +39,19 @@
 
 #define G_USEC_PER_SEC 1000000
 
-GTimer* g_timer_new	(void);
-void	g_timer_destroy (GTimer	  *timer);
-void	g_timer_start	(GTimer	  *timer);
-void	g_timer_stop	(GTimer	  *timer);
-void	g_timer_reset	(GTimer	  *timer);
-void	g_timer_continue	(GTimer   *timer);
-gdouble g_timer_elapsed (GTimer	  *timer,
-			 gulong	  *microseconds);
+GLIB_FUNC GTimer* g_timer_new	(void);
+GLIB_FUNC void	g_timer_destroy (GTimer	  *timer);
+GLIB_FUNC void	g_timer_start	(GTimer	  *timer);
+GLIB_FUNC void	g_timer_stop	(GTimer	  *timer);
+GLIB_FUNC void	g_timer_reset	(GTimer	  *timer);
+GLIB_FUNC void	g_timer_continue	(GTimer   *timer);
+GLIB_FUNC gdouble g_timer_elapsed (GTimer	  *timer,
+			 gulong	  *microseconds);;
 
-void    g_usleep        (gulong    microseconds);
+GLIB_FUNC void    g_usleep        (gulong    microseconds);
 
-void    g_time_val_add  (GTimeVal *time_, 
-                         glong     microseconds);
+GLIB_FUNC void    g_time_val_add  (GTimeVal *time_, 
+                         glong     microseconds);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gtree.h~visibility.patch
+++ glib-2.4.6/glib/gtree.h
@@ -39,46 +39,46 @@
 
 /* Balanced binary trees
  */
-GTree*   g_tree_new             (GCompareFunc      key_compare_func);
-GTree*   g_tree_new_with_data   (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data);
-GTree*   g_tree_new_full        (GCompareDataFunc  key_compare_func,
+GLIB_FUNC GTree*   g_tree_new             (GCompareFunc      key_compare_func);
+GLIB_FUNC GTree*   g_tree_new_with_data   (GCompareDataFunc  key_compare_func,
+                                 gpointer          key_compare_data);;
+GLIB_FUNC GTree*   g_tree_new_full        (GCompareDataFunc  key_compare_func,
                                  gpointer          key_compare_data,
                                  GDestroyNotify    key_destroy_func,
-                                 GDestroyNotify    value_destroy_func);
-void     g_tree_destroy         (GTree            *tree);
-void     g_tree_insert          (GTree            *tree,
+                                 GDestroyNotify    value_destroy_func);;
+GLIB_FUNC void     g_tree_destroy         (GTree            *tree);
+GLIB_FUNC void     g_tree_insert          (GTree            *tree,
                                  gpointer          key,
-                                 gpointer          value);
-void     g_tree_replace         (GTree            *tree,
+                                 gpointer          value);;
+GLIB_FUNC void     g_tree_replace         (GTree            *tree,
                                  gpointer          key,
-                                 gpointer          value);
-void     g_tree_remove          (GTree            *tree,
-                                 gconstpointer     key);
-void     g_tree_steal           (GTree            *tree,
-                                 gconstpointer     key);
-gpointer g_tree_lookup          (GTree            *tree,
-                                 gconstpointer     key);
-gboolean g_tree_lookup_extended (GTree            *tree,
+                                 gpointer          value);;
+GLIB_FUNC void     g_tree_remove          (GTree            *tree,
+                                 gconstpointer     key);;
+GLIB_FUNC void     g_tree_steal           (GTree            *tree,
+                                 gconstpointer     key);;
+GLIB_FUNC gpointer g_tree_lookup          (GTree            *tree,
+                                 gconstpointer     key);;
+GLIB_FUNC gboolean g_tree_lookup_extended (GTree            *tree,
                                  gconstpointer     lookup_key,
                                  gpointer         *orig_key,
-                                 gpointer         *value);
-void     g_tree_foreach         (GTree            *tree,
+                                 gpointer         *value);;
+GLIB_FUNC void     g_tree_foreach         (GTree            *tree,
                                  GTraverseFunc	   func,
-                                 gpointer	   user_data);
+                                 gpointer	   user_data);;
 
 #ifndef G_DISABLE_DEPRECATED
-void     g_tree_traverse        (GTree            *tree,
+GLIB_FUNC void     g_tree_traverse        (GTree            *tree,
                                  GTraverseFunc     traverse_func,
                                  GTraverseType     traverse_type,
-                                 gpointer          user_data);
+                                 gpointer          user_data);;
 #endif /* G_DISABLE_DEPRECATED */
 
-gpointer g_tree_search          (GTree            *tree,
+GLIB_FUNC gpointer g_tree_search          (GTree            *tree,
                                  GCompareFunc      search_func,
-                                 gconstpointer     user_data);
-gint     g_tree_height          (GTree            *tree);
-gint     g_tree_nnodes          (GTree            *tree);
+                                 gconstpointer     user_data);;
+GLIB_FUNC gint     g_tree_height          (GTree            *tree);
+GLIB_FUNC gint     g_tree_nnodes          (GTree            *tree);
 
 
 
--- glib-2.4.6/glib/gtypes.h~visibility.patch
+++ glib-2.4.6/glib/gtypes.h
@@ -411,9 +411,42 @@
 #      endif /* !GLIB_COMPILATION */
 #    endif /* !GLIB_STATIC_COMPILATION */
 #  else /* !G_PLATFORM_WIN32 */
-#    define GLIB_VAR extern
+#    ifdef GLIB_STATIC_COMPILATION
+#      define GLIB_VAR extern
+#    else /* !GLIB_STATIC_COMPILATION */
+#      ifdef GLIB_COMPILATION
+#        ifdef GCC_HASCLASSVISIBILITY
+#          define GLIB_VAR __attribute__ ((visibility("default")))
+#        endif /* !GCC_HASCLASSVISIBILITY */
+#      endif /* !GLIB_COMPILATION */
+#    endif /* !GLIB_STATIC_COMPILATION */
+#    ifndef GLIB_VAR
+#      define GLIB_VAR extern
+#    endif /* !GLIB_VAR */
 #  endif /* !G_PLATFORM_WIN32 */
 #endif /* GLIB_VAR */
+#ifndef GLIB_FUNC
+#  ifdef G_PLATFORM_WIN32
+#    ifndef GLIB_STATIC_COMPILATION
+#      ifdef GLIB_COMPILATION
+#        define GLIB_FUNC __declspec(dllexport)
+#      else /* !GLIB_COMPILATION */
+#        define GLIB_FUNC __declspec(dllimport)
+#      endif /* !GLIB_COMPILATION */
+#    endif /* !GLIB_STATIC_COMPILATION */
+#  else /* !G_PLATFORM_WIN32 */
+#    ifndef GLIB_STATIC_COMPILATION
+#      ifdef GLIB_COMPILATION
+#        ifdef GCC_HASCLASSVISIBILITY
+#          define GLIB_FUNC __attribute__ ((visibility("default")))
+#        endif /* !GCC_HASCLASSVISIBILITY */
+#      endif /* !GLIB_COMPILATION */
+#    endif /* !GLIB_STATIC_COMPILATION */
+#    ifndef GLIB_FUNC
+#      define GLIB_FUNC
+#    endif /* !GLIB_FUNC */
+#  endif /* !G_PLATFORM_WIN32 */
+#endif /* GLIB_FUNC */
 
 #endif /* __G_TYPES_H__ */
 
--- glib-2.4.6/glib/gunicode.h~visibility.patch
+++ glib-2.4.6/glib/gunicode.h
@@ -111,55 +111,55 @@
  * in case the locale's charset will be changed later using setlocale()
  * or in some other way.
  */
-gboolean g_get_charset (G_CONST_RETURN char **charset);
+GLIB_FUNC gboolean g_get_charset (G_CONST_RETURN char **charset);
 
 /* These are all analogs of the <ctype.h> functions.
  */
-gboolean g_unichar_isalnum   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isalpha   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iscntrl   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdigit   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isgraph   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_islower   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isprint   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_ispunct   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isspace   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isupper   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isxdigit  (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_istitle   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdefined (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iswide    (gunichar c) G_GNUC_CONST;
+GLIB_FUNC gboolean g_unichar_isalnum   (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_isalpha   (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_iscntrl   (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_isdigit   (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_isgraph   (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_islower   (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_isprint   (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_ispunct   (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_isspace   (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_isupper   (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_isxdigit  (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_istitle   (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_isdefined (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gboolean g_unichar_iswide    (gunichar c) G_GNUC_CONST;;
 
 /* More <ctype.h> functions.  These convert between the three cases.
  * See the Unicode book to understand title case.  */
-gunichar g_unichar_toupper (gunichar c) G_GNUC_CONST;
-gunichar g_unichar_tolower (gunichar c) G_GNUC_CONST;
-gunichar g_unichar_totitle (gunichar c) G_GNUC_CONST;
+GLIB_FUNC gunichar g_unichar_toupper (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gunichar g_unichar_tolower (gunichar c) G_GNUC_CONST;;
+GLIB_FUNC gunichar g_unichar_totitle (gunichar c) G_GNUC_CONST;;
 
 /* If C is a digit (according to `g_unichar_isdigit'), then return its
    numeric value.  Otherwise return -1.  */
-gint g_unichar_digit_value (gunichar c) G_GNUC_CONST;
+GLIB_FUNC gint g_unichar_digit_value (gunichar c) G_GNUC_CONST;;
 
-gint g_unichar_xdigit_value (gunichar c) G_GNUC_CONST;
+GLIB_FUNC gint g_unichar_xdigit_value (gunichar c) G_GNUC_CONST;;
 
 /* Return the Unicode character type of a given character.  */
-GUnicodeType g_unichar_type (gunichar c) G_GNUC_CONST;
+GLIB_FUNC GUnicodeType g_unichar_type (gunichar c) G_GNUC_CONST;;
 
 /* Return the line break property for a given character */
-GUnicodeBreakType g_unichar_break_type (gunichar c) G_GNUC_CONST;
+GLIB_FUNC GUnicodeBreakType g_unichar_break_type (gunichar c) G_GNUC_CONST;;
 
 
 /* Compute canonical ordering of a string in-place.  This rearranges
    decomposed characters in the string according to their combining
    classes.  See the Unicode manual for more information.  */
-void g_unicode_canonical_ordering (gunichar *string,
-				   gsize     len);
+GLIB_FUNC void g_unicode_canonical_ordering (gunichar *string,
+				   gsize     len);;
 
 /* Compute canonical decomposition of a character.  Returns g_malloc()d
    string of Unicode characters.  RESULT_LEN is set to the resulting
    length of the string.  */
-gunichar *g_unicode_canonical_decomposition (gunichar  ch,
-					     gsize    *result_len);
+GLIB_FUNC gunichar *g_unicode_canonical_decomposition (gunichar  ch,
+					     gsize    *result_len);;
 
 /* Array of skip-bytes-per-initial character.
  */
@@ -167,97 +167,97 @@
 
 #define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(guchar *)(p)])
 
-gunichar g_utf8_get_char           (const gchar  *p);
-gunichar g_utf8_get_char_validated (const  gchar *p,
-				    gssize        max_len);
+GLIB_FUNC gunichar g_utf8_get_char           (const gchar  *p);
+GLIB_FUNC gunichar g_utf8_get_char_validated (const  gchar *p,
+				    gssize        max_len);;
 
-gchar*   g_utf8_offset_to_pointer (const gchar *str,
-                                   glong        offset);  
-glong    g_utf8_pointer_to_offset (const gchar *str,      
-				   const gchar *pos);
-gchar*   g_utf8_prev_char         (const gchar *p);
-gchar*   g_utf8_find_next_char    (const gchar *p,
-				   const gchar *end);
-gchar*   g_utf8_find_prev_char    (const gchar *str,
-				   const gchar *p);
+GLIB_FUNC gchar*   g_utf8_offset_to_pointer (const gchar *str,
+                                   glong        offset);;  
+GLIB_FUNC glong    g_utf8_pointer_to_offset (const gchar *str,      
+				   const gchar *pos);;
+GLIB_FUNC gchar*   g_utf8_prev_char         (const gchar *p);
+GLIB_FUNC gchar*   g_utf8_find_next_char    (const gchar *p,
+				   const gchar *end);;
+GLIB_FUNC gchar*   g_utf8_find_prev_char    (const gchar *str,
+				   const gchar *p);;
 
-glong g_utf8_strlen (const gchar *p,  
-		     gssize       max);        
+GLIB_FUNC glong g_utf8_strlen (const gchar *p,  
+		     gssize       max);;        
 
 /* Copies n characters from src to dest */
-gchar* g_utf8_strncpy (gchar       *dest,
+GLIB_FUNC gchar* g_utf8_strncpy (gchar       *dest,
 		       const gchar *src,
-		       gsize        n);
+		       gsize        n);;
 
 /* Find the UTF-8 character corresponding to ch, in string p. These
    functions are equivalants to strchr and strrchr */
-gchar* g_utf8_strchr  (const gchar *p,
+GLIB_FUNC gchar* g_utf8_strchr  (const gchar *p,
 		       gssize       len,
-		       gunichar     c);
-gchar* g_utf8_strrchr (const gchar *p,
+		       gunichar     c);;
+GLIB_FUNC gchar* g_utf8_strrchr (const gchar *p,
 		       gssize       len,
-		       gunichar     c);
-gchar* g_utf8_strreverse (const gchar *str,
-			  gssize len);
+		       gunichar     c);;
+GLIB_FUNC gchar* g_utf8_strreverse (const gchar *str,
+			  gssize len);;
 
-gunichar2 *g_utf8_to_utf16     (const gchar      *str,
+GLIB_FUNC gunichar2 *g_utf8_to_utf16     (const gchar      *str,
 				glong             len,            
 				glong            *items_read,     
 				glong            *items_written,  
-				GError          **error);
-gunichar * g_utf8_to_ucs4      (const gchar      *str,
+				GError          **error);;
+GLIB_FUNC gunichar * g_utf8_to_ucs4      (const gchar      *str,
 				glong             len,            
 				glong            *items_read,     
 				glong            *items_written,  
-				GError          **error);
-gunichar * g_utf8_to_ucs4_fast (const gchar      *str,
+				GError          **error);;
+GLIB_FUNC gunichar * g_utf8_to_ucs4_fast (const gchar      *str,
 				glong             len,            
-				glong            *items_written); 
-gunichar * g_utf16_to_ucs4     (const gunichar2  *str,
+				glong            *items_written);; 
+GLIB_FUNC gunichar * g_utf16_to_ucs4     (const gunichar2  *str,
 				glong             len,            
 				glong            *items_read,     
 				glong            *items_written,  
-				GError          **error);
-gchar*     g_utf16_to_utf8     (const gunichar2  *str,
+				GError          **error);;
+GLIB_FUNC gchar*     g_utf16_to_utf8     (const gunichar2  *str,
 				glong             len,            
 				glong            *items_read,     
 				glong            *items_written,  
-				GError          **error);
-gunichar2 *g_ucs4_to_utf16     (const gunichar   *str,
+				GError          **error);;
+GLIB_FUNC gunichar2 *g_ucs4_to_utf16     (const gunichar   *str,
 				glong             len,            
 				glong            *items_read,     
 				glong            *items_written,  
-				GError          **error);
-gchar*     g_ucs4_to_utf8      (const gunichar   *str,
+				GError          **error);;
+GLIB_FUNC gchar*     g_ucs4_to_utf8      (const gunichar   *str,
 				glong             len,            
 				glong            *items_read,     
 				glong            *items_written,  
-				GError          **error);
+				GError          **error);;
 
 /* Convert a single character into UTF-8. outbuf must have at
  * least 6 bytes of space. Returns the number of bytes in the
  * result.
  */
-gint      g_unichar_to_utf8 (gunichar    c,
-			     gchar      *outbuf);
+GLIB_FUNC gint      g_unichar_to_utf8 (gunichar    c,
+			     gchar      *outbuf);;
 
 /* Validate a UTF8 string, return TRUE if valid, put pointer to
  * first invalid char in **end
  */
 
-gboolean g_utf8_validate (const gchar  *str,
+GLIB_FUNC gboolean g_utf8_validate (const gchar  *str,
                           gssize        max_len,  
-                          const gchar **end);
+                          const gchar **end);;
 
 /* Validate a Unicode character */
-gboolean g_unichar_validate (gunichar ch);
+GLIB_FUNC gboolean g_unichar_validate (gunichar ch);
 
-gchar *g_utf8_strup   (const gchar *str,
-		       gssize       len);
-gchar *g_utf8_strdown (const gchar *str,
-		       gssize       len);
-gchar *g_utf8_casefold (const gchar *str,
-			gssize       len);
+GLIB_FUNC gchar *g_utf8_strup   (const gchar *str,
+		       gssize       len);;
+GLIB_FUNC gchar *g_utf8_strdown (const gchar *str,
+		       gssize       len);;
+GLIB_FUNC gchar *g_utf8_casefold (const gchar *str,
+			gssize       len);;
 
 typedef enum {
   G_NORMALIZE_DEFAULT,
@@ -270,17 +270,17 @@
   G_NORMALIZE_NFKC = G_NORMALIZE_ALL_COMPOSE
 } GNormalizeMode;
 
-gchar *g_utf8_normalize (const gchar   *str,
+GLIB_FUNC gchar *g_utf8_normalize (const gchar   *str,
 			 gssize         len,
-			 GNormalizeMode mode);
+			 GNormalizeMode mode);;
 
-gint   g_utf8_collate     (const gchar *str1,
-			   const gchar *str2);
-gchar *g_utf8_collate_key (const gchar *str,
-			   gssize       len);
+GLIB_FUNC gint   g_utf8_collate     (const gchar *str1,
+			   const gchar *str2);;
+GLIB_FUNC gchar *g_utf8_collate_key (const gchar *str,
+			   gssize       len);;
 
-gboolean g_unichar_get_mirror_char (gunichar ch,
-                                    gunichar *mirrored_ch);
+GLIB_FUNC gboolean g_unichar_get_mirror_char (gunichar ch,
+                                    gunichar *mirrored_ch);;
 
 G_END_DECLS
 
--- glib-2.4.6/glib/gutils.h~visibility.patch
+++ glib-2.4.6/glib/gutils.h
@@ -113,14 +113,14 @@
 
 /* Retrive static string info
  */
-G_CONST_RETURN gchar* g_get_user_name        (void);
-G_CONST_RETURN gchar* g_get_real_name        (void);
-G_CONST_RETURN gchar* g_get_home_dir         (void);
-G_CONST_RETURN gchar* g_get_tmp_dir          (void);
-gchar*                g_get_prgname          (void);
-void                  g_set_prgname          (const gchar *prgname);
-G_CONST_RETURN gchar* g_get_application_name (void);
-void                  g_set_application_name (const gchar *application_name);
+GLIB_FUNC G_CONST_RETURN gchar* g_get_user_name        (void);
+GLIB_FUNC G_CONST_RETURN gchar* g_get_real_name        (void);
+GLIB_FUNC G_CONST_RETURN gchar* g_get_home_dir         (void);
+GLIB_FUNC G_CONST_RETURN gchar* g_get_tmp_dir          (void);
+GLIB_FUNC gchar*                g_get_prgname          (void);
+GLIB_FUNC void                  g_set_prgname          (const gchar *prgname);
+GLIB_FUNC G_CONST_RETURN gchar* g_get_application_name (void);
+GLIB_FUNC void                  g_set_application_name (const gchar *application_name);
 
 
 typedef struct _GDebugKey	GDebugKey;
@@ -132,24 +132,24 @@
 
 /* Miscellaneous utility functions
  */
-guint                 g_parse_debug_string (const gchar     *string,
+GLIB_FUNC guint                 g_parse_debug_string (const gchar     *string,
 					    const GDebugKey *keys,
-					    guint            nkeys);
+					    guint            nkeys);;
 
-gint                  g_snprintf           (gchar       *string,
+GLIB_FUNC gint                  g_snprintf           (gchar       *string,
 					    gulong       n,
 					    gchar const *format,
-					    ...) G_GNUC_PRINTF (3, 4);
-gint                  g_vsnprintf          (gchar       *string,
+					    ...) G_GNUC_PRINTF (3, 4);;
+GLIB_FUNC gint                  g_vsnprintf          (gchar       *string,
 					    gulong       n,
 					    gchar const *format,
-					    va_list      args);
+					    va_list      args);;
 
 /* Check if a file name is an absolute path */
-gboolean              g_path_is_absolute   (const gchar *file_name);
+GLIB_FUNC gboolean              g_path_is_absolute   (const gchar *file_name);
 
 /* In case of absolute paths, skip the root part */
-G_CONST_RETURN gchar* g_path_skip_root     (const gchar *file_name);
+GLIB_FUNC G_CONST_RETURN gchar* g_path_skip_root     (const gchar *file_name);
 
 #ifndef G_DISABLE_DEPRECATED
 
@@ -157,27 +157,27 @@
  * major release of GLib. Use g_path_get_dirname/g_path_get_basename
  * instead. Whatch out! The string returned by g_path_get_basename
  * must be g_freed, while the string returned by g_basename must not.*/
-G_CONST_RETURN gchar* g_basename           (const gchar *file_name);
+GLIB_FUNC G_CONST_RETURN gchar* g_basename           (const gchar *file_name);
 #define g_dirname g_path_get_dirname
 
 #endif /* G_DISABLE_DEPRECATED */
 
 /* The returned strings are newly allocated with g_malloc() */
-gchar*                g_get_current_dir    (void);
-gchar*                g_path_get_basename  (const gchar *file_name);
-gchar*                g_path_get_dirname   (const gchar *file_name);
+GLIB_FUNC gchar*                g_get_current_dir    (void);
+GLIB_FUNC gchar*                g_path_get_basename  (const gchar *file_name);
+GLIB_FUNC gchar*                g_path_get_dirname   (const gchar *file_name);
 
 
 /* Set the pointer at the specified location to NULL */
-void                  g_nullify_pointer    (gpointer    *nullify_location);
+GLIB_FUNC void                  g_nullify_pointer    (gpointer    *nullify_location);
 
 /* return the environment string for the variable. The returned memory
  * must not be freed. */
-G_CONST_RETURN gchar* g_getenv             (const gchar *variable);
-gboolean              g_setenv             (const gchar *variable,
+GLIB_FUNC G_CONST_RETURN gchar* g_getenv             (const gchar *variable);
+GLIB_FUNC gboolean              g_setenv             (const gchar *variable,
 					    const gchar *value,
-					    gboolean     overwrite);
-void                  g_unsetenv           (const gchar *variable);
+					    gboolean     overwrite);;
+GLIB_FUNC void                  g_unsetenv           (const gchar *variable);
 
 
 /* we try to provide a usefull equivalent for ATEXIT if it is
@@ -195,18 +195,18 @@
  * (if there is any in the implementation) and doesn't encounter
  * missing include files.
  */
-void	g_atexit		(GVoidFunc    func);
+GLIB_FUNC void	g_atexit		(GVoidFunc    func);
 
 /* Look for an executable in PATH, following execvp() rules */
-gchar*  g_find_program_in_path  (const gchar *program);
+GLIB_FUNC gchar*  g_find_program_in_path  (const gchar *program);
 
 /* Bit tests
  */
-G_INLINE_FUNC gint	g_bit_nth_lsf (gulong  mask,
-				       gint    nth_bit);
-G_INLINE_FUNC gint	g_bit_nth_msf (gulong  mask,
-				       gint    nth_bit);
-G_INLINE_FUNC guint	g_bit_storage (gulong  number);
+GLIB_FUNC G_INLINE_FUNC gint	g_bit_nth_lsf (gulong  mask,
+				       gint    nth_bit);;
+GLIB_FUNC G_INLINE_FUNC gint	g_bit_nth_msf (gulong  mask,
+				       gint    nth_bit);;
+GLIB_FUNC G_INLINE_FUNC guint	g_bit_storage (gulong  number);
 
 /* Trash Stacks
  * elements need to be >= sizeof (gpointer)
@@ -217,11 +217,11 @@
   GTrashStack *next;
 };
 
-G_INLINE_FUNC void	g_trash_stack_push	(GTrashStack **stack_p,
-						 gpointer      data_p);
-G_INLINE_FUNC gpointer	g_trash_stack_pop	(GTrashStack **stack_p);
-G_INLINE_FUNC gpointer	g_trash_stack_peek	(GTrashStack **stack_p);
-G_INLINE_FUNC guint	g_trash_stack_height	(GTrashStack **stack_p);
+GLIB_FUNC G_INLINE_FUNC void	g_trash_stack_push	(GTrashStack **stack_p,
+						 gpointer      data_p);;
+GLIB_FUNC G_INLINE_FUNC gpointer	g_trash_stack_pop	(GTrashStack **stack_p);
+GLIB_FUNC G_INLINE_FUNC gpointer	g_trash_stack_peek	(GTrashStack **stack_p);
+GLIB_FUNC G_INLINE_FUNC guint	g_trash_stack_height	(GTrashStack **stack_p);
 
 /* inline function implementations
  */
--- glib-2.4.6/glib/gwin32.h~visibility.patch
+++ glib-2.4.6/glib/gwin32.h
@@ -68,8 +68,8 @@
  */
 #    define ftruncate(fd, size)	g_win32_ftruncate (fd, size)
 
-gint		g_win32_ftruncate	(gint		 f,
-					 guint		 size);
+GLIB_FUNC gint		g_win32_ftruncate	(gint		 f,
+					 guint		 size);;
 #endif /* G_OS_WIN32 */
 
 /* The MS setlocale uses locale names of the form "English_United
@@ -78,20 +78,20 @@
  * returns it as a string of the above form for use in forming file
  * names etc. The returned string should be deallocated with g_free().
  */
-gchar* 		g_win32_getlocale  (void);
+GLIB_FUNC gchar* 		g_win32_getlocale  (void);
 
 /* Translate a Win32 error code (as returned by GetLastError()) into
  * the corresponding message. The returned string should be deallocated
  * with g_free().
  */
-gchar*          g_win32_error_message (gint error);
+GLIB_FUNC gchar*          g_win32_error_message (gint error);
 
-gchar*          g_win32_get_package_installation_directory (gchar *package,
-							    gchar *dll_name);
+GLIB_FUNC gchar*          g_win32_get_package_installation_directory (gchar *package,
+							    gchar *dll_name);;
 
-gchar*          g_win32_get_package_installation_subdirectory (gchar *package,
+GLIB_FUNC gchar*          g_win32_get_package_installation_subdirectory (gchar *package,
 							       gchar *dll_name,
-							       gchar *subdir);
+							       gchar *subdir);;
 
 G_END_DECLS
 
--- glib-2.4.6/gmodule/gmodule.def~visibility.patch
+++ glib-2.4.6/gmodule/gmodule.def
@@ -1,4 +1,3 @@
-EXPORTS
 	g_module_build_path
 	g_module_close
 	g_module_error
--- glib-2.4.6/gmodule/gmodule.h~visibility.patch
+++ glib-2.4.6/gmodule/gmodule.h
@@ -38,9 +38,35 @@
 #ifdef G_PLATFORM_WIN32
 #  define	G_MODULE_EXPORT		__declspec(dllexport)
 #else /* !G_PLATFORM_WIN32 */
-#  define	G_MODULE_EXPORT
+#  ifdef GCC_HASCLASSVISIBILITY
+#    define G_MODULE_EXPORT __attribute__ ((visibility("default")))
+#  else /* !GCC_HASCLASSVISIBILITY */
+#    define G_MODULE_EXPORT
+#  endif /* !GCC_HASCLASSVISIBILITY */
 #endif /* !G_PLATFORM_WIN32 */
 
+#ifndef GMODULE_FUNC
+#  ifdef G_PLATFORM_WIN32
+#    ifndef GMODULE_STATIC_COMPILATION
+#      ifdef GMODULE_COMPILATION
+#        define GMODULE_FUNC __declspec(dllexport)
+#      else /* !GMODULE_COMPILATION */
+#        define GMODULE_FUNC __declspec(dllimport)
+#      endif /* !GMODULE_COMPILATION */
+#    endif /* !GMODULE_STATIC_COMPILATION */
+#  else /* !G_PLATFORM_WIN32 */
+#    ifndef GMODULE_STATIC_COMPILATION
+#      ifdef GMODULE_COMPILATION
+#        ifdef GCC_HASCLASSVISIBILITY
+#          define GMODULE_FUNC __attribute__ ((visibility("default")))
+#        endif
+#      endif /* !GMODULE_COMPILATION */
+#    endif /* !GMODULE_STATIC_COMPILATION */
+#    ifndef GMODULE_FUNC
+#      define GMODULE_FUNC
+#    endif /* !GMODULE_FUNC */
+#  endif /* !G_PLATFORM_WIN32 */
+#endif /* GMODULE_FUNC */
 typedef enum
 {
   G_MODULE_BIND_LAZY	= 1 << 0,
@@ -53,28 +79,28 @@
 typedef void	     (*GModuleUnload)	 (GModule	*module);
 
 /* return TRUE if dynamic module loading is supported */
-gboolean	g_module_supported	   (void) G_GNUC_CONST;
+GMODULE_FUNC gboolean	g_module_supported	   (void) G_GNUC_CONST;
 
 /* open a module `file_name' and return handle, which is NULL on error */
-GModule*              g_module_open          (const gchar  *file_name,
+GMODULE_FUNC GModule*              g_module_open          (const gchar  *file_name,
 					      GModuleFlags  flags);
 
 /* close a previously opened module, returns TRUE on success */
-gboolean              g_module_close         (GModule      *module);
+GMODULE_FUNC gboolean              g_module_close         (GModule      *module);
 
 /* make a module resident so g_module_close on it will be ignored */
-void                  g_module_make_resident (GModule      *module);
+GMODULE_FUNC void                  g_module_make_resident (GModule      *module);
 
 /* query the last module error as a string */
-G_CONST_RETURN gchar* g_module_error         (void);
+GMODULE_FUNC G_CONST_RETURN gchar* g_module_error         (void);
 
 /* retrieve a symbol pointer from `module', returns TRUE on success */
-gboolean              g_module_symbol        (GModule      *module,
+GMODULE_FUNC gboolean              g_module_symbol        (GModule      *module,
 					      const gchar  *symbol_name,
 					      gpointer     *symbol);
 
 /* retrieve the file name from an existing module */
-G_CONST_RETURN gchar* g_module_name          (GModule      *module);
+GMODULE_FUNC G_CONST_RETURN gchar* g_module_name          (GModule      *module);
 
 /* Build the actual file name containing a module. `directory' is the
  * directory where the module file is supposed to be, or NULL or empty
@@ -87,7 +113,7 @@
  *
  * No checks are made that the file exists, or is of correct type.
  */
-gchar*                g_module_build_path    (const gchar  *directory,
+GMODULE_FUNC gchar*                g_module_build_path    (const gchar  *directory,
 					      const gchar  *module_name);
 
 
--- glib-2.4.6/gmodule/Makefile.am~visibility.patch
+++ glib-2.4.6/gmodule/Makefile.am
@@ -1,7 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule \
-	-DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED
+	-DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@ \
+	-DG_DISABLE_DEPRECATED \
+	-DGMODULE_COMPILATION
 
 EXTRA_DIST =	\
 		makefile.msc.in \
--- glib-2.4.6/gobject/gboxed.h~visibility.patch
+++ glib-2.4.6/gobject/gboxed.h
@@ -38,22 +38,22 @@
 
 
 /* --- prototypes --- */
-gpointer	g_boxed_copy			(GType		 boxed_type,
-						 gconstpointer	 src_boxed);
-void		g_boxed_free			(GType		 boxed_type,
-						 gpointer	 boxed);
-void		g_value_set_boxed		(GValue		*value,
-						 gconstpointer	 v_boxed);
-void		g_value_set_static_boxed	(GValue		*value,
-						 gconstpointer	 v_boxed);
-gpointer	g_value_get_boxed		(const GValue	*value);
-gpointer	g_value_dup_boxed		(const GValue	*value);
+GOBJECT_FUNC gpointer	g_boxed_copy			(GType		 boxed_type,
+						 gconstpointer	 src_boxed);;
+GOBJECT_FUNC void		g_boxed_free			(GType		 boxed_type,
+						 gpointer	 boxed);;
+GOBJECT_FUNC void		g_value_set_boxed		(GValue		*value,
+						 gconstpointer	 v_boxed);;
+GOBJECT_FUNC void		g_value_set_static_boxed	(GValue		*value,
+						 gconstpointer	 v_boxed);;
+GOBJECT_FUNC gpointer	g_value_get_boxed		(const GValue	*value);;
+GOBJECT_FUNC gpointer	g_value_dup_boxed		(const GValue	*value);;
 
 
 /* --- convenience --- */
-GType	g_boxed_type_register_static		(const gchar	*name,
+GOBJECT_FUNC GType	g_boxed_type_register_static		(const gchar	*name,
 						 GBoxedCopyFunc	 boxed_copy,
-						 GBoxedFreeFunc	 boxed_free);
+						 GBoxedFreeFunc	 boxed_free);;
 
 
 /* --- GLib boxed types --- */
@@ -64,17 +64,17 @@
 #define	G_TYPE_GSTRING		(g_gstring_get_type ())
 
 
-void    g_value_take_boxed      (GValue		*value,
-				 gconstpointer	 v_boxed);
+GOBJECT_FUNC void    g_value_take_boxed      (GValue		*value,
+				 gconstpointer	 v_boxed);;
 #ifndef G_DISABLE_DEPRECATED
-void	g_value_set_boxed_take_ownership	(GValue		*value,
-						 gconstpointer	 v_boxed);
+GOBJECT_FUNC void	g_value_set_boxed_take_ownership	(GValue		*value,
+						 gconstpointer	 v_boxed);;
 #endif
-GType	g_closure_get_type	(void)	G_GNUC_CONST;
-GType	g_value_get_type	(void)	G_GNUC_CONST;
-GType	g_value_array_get_type	(void)	G_GNUC_CONST;
-GType	g_strv_get_type	        (void)	G_GNUC_CONST;
-GType	g_gstring_get_type      (void)	G_GNUC_CONST;
+GOBJECT_FUNC GType	g_closure_get_type	(void)	G_GNUC_CONST;
+GOBJECT_FUNC GType	g_value_get_type	(void)	G_GNUC_CONST;
+GOBJECT_FUNC GType	g_value_array_get_type	(void)	G_GNUC_CONST;
+GOBJECT_FUNC GType	g_strv_get_type	        (void)	G_GNUC_CONST;
+GOBJECT_FUNC GType	g_gstring_get_type      (void)	G_GNUC_CONST;
 
 typedef gchar** GStrv;
      
--- glib-2.4.6/gobject/gclosure.h~visibility.patch
+++ glib-2.4.6/gobject/gclosure.h
@@ -100,51 +100,51 @@
 
 
 /* --- prototypes --- */
-GClosure* g_cclosure_new			(GCallback	callback_func,
+GOBJECT_FUNC GClosure* g_cclosure_new			(GCallback	callback_func,
 						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GClosure* g_cclosure_new_swap			(GCallback	callback_func,
+						 GClosureNotify destroy_data);;
+GOBJECT_FUNC GClosure* g_cclosure_new_swap			(GCallback	callback_func,
 						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GClosure* g_signal_type_cclosure_new		(GType          itype,
-						 guint          struct_offset);
+						 GClosureNotify destroy_data);;
+GOBJECT_FUNC GClosure* g_signal_type_cclosure_new		(GType          itype,
+						 guint          struct_offset);;
 
 
 /* --- prototypes --- */
-GClosure* g_closure_ref				(GClosure	*closure);
-void	  g_closure_sink			(GClosure	*closure);
-void	  g_closure_unref			(GClosure	*closure);
+GOBJECT_FUNC GClosure* g_closure_ref				(GClosure	*closure);;
+GOBJECT_FUNC void	  g_closure_sink			(GClosure	*closure);;
+GOBJECT_FUNC void	  g_closure_unref			(GClosure	*closure);;
 /* intimidating */
-GClosure* g_closure_new_simple			(guint		 sizeof_closure,
-						 gpointer	 data);
-void	  g_closure_add_finalize_notifier	(GClosure       *closure,
+GOBJECT_FUNC GClosure* g_closure_new_simple			(guint		 sizeof_closure,
+						 gpointer	 data);;
+GOBJECT_FUNC void	  g_closure_add_finalize_notifier	(GClosure       *closure,
 						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_remove_finalize_notifier	(GClosure       *closure,
+						 GClosureNotify	 notify_func);;
+GOBJECT_FUNC void	  g_closure_remove_finalize_notifier	(GClosure       *closure,
 						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_add_invalidate_notifier	(GClosure       *closure,
+						 GClosureNotify	 notify_func);;
+GOBJECT_FUNC void	  g_closure_add_invalidate_notifier	(GClosure       *closure,
 						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_remove_invalidate_notifier	(GClosure       *closure,
+						 GClosureNotify	 notify_func);;
+GOBJECT_FUNC void	  g_closure_remove_invalidate_notifier	(GClosure       *closure,
 						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_add_marshal_guards		(GClosure	*closure,
+						 GClosureNotify	 notify_func);;
+GOBJECT_FUNC void	  g_closure_add_marshal_guards		(GClosure	*closure,
 						 gpointer        pre_marshal_data,
 						 GClosureNotify	 pre_marshal_notify,
 						 gpointer        post_marshal_data,
-						 GClosureNotify	 post_marshal_notify);
-void	  g_closure_set_marshal			(GClosure	*closure,
-						 GClosureMarshal marshal);
-void	  g_closure_set_meta_marshal		(GClosure       *closure,
+						 GClosureNotify	 post_marshal_notify);;
+GOBJECT_FUNC void	  g_closure_set_marshal			(GClosure	*closure,
+						 GClosureMarshal marshal);;
+GOBJECT_FUNC void	  g_closure_set_meta_marshal		(GClosure       *closure,
 						 gpointer	 marshal_data,
-						 GClosureMarshal meta_marshal);
-void	  g_closure_invalidate			(GClosure	*closure);
-void	  g_closure_invoke			(GClosure 	*closure,
+						 GClosureMarshal meta_marshal);;
+GOBJECT_FUNC void	  g_closure_invalidate			(GClosure	*closure);;
+GOBJECT_FUNC void	  g_closure_invoke			(GClosure 	*closure,
 						 GValue	/*out*/	*return_value,
 						 guint		 n_param_values,
 						 const GValue	*param_values,
-						 gpointer	 invocation_hint);
+						 gpointer	 invocation_hint);;
 
 /* FIXME:
    OK:  data_object::destroy		-> closure_invalidate();
--- glib-2.4.6/gobject/genums.h~visibility.patch
+++ glib-2.4.6/gobject/genums.h
@@ -81,24 +81,24 @@
 
 
 /* --- prototypes --- */
-GEnumValue*	g_enum_get_value		(GEnumClass	*enum_class,
-						 gint		 value);
-GEnumValue*	g_enum_get_value_by_name	(GEnumClass	*enum_class,
-						 const gchar	*name);
-GEnumValue*	g_enum_get_value_by_nick	(GEnumClass	*enum_class,
-						 const gchar	*nick);
-GFlagsValue*	g_flags_get_first_value		(GFlagsClass	*flags_class,
-						 guint		 value);
-GFlagsValue*	g_flags_get_value_by_name	(GFlagsClass	*flags_class,
-						 const gchar	*name);
-GFlagsValue*	g_flags_get_value_by_nick	(GFlagsClass	*flags_class,
-						 const gchar	*nick);
-void            g_value_set_enum        	(GValue         *value,
-						 gint            v_enum);
-gint            g_value_get_enum        	(const GValue   *value);
-void            g_value_set_flags       	(GValue         *value,
-						 guint           v_flags);
-guint           g_value_get_flags       	(const GValue   *value);
+GOBJECT_FUNC GEnumValue*	g_enum_get_value		(GEnumClass	*enum_class,
+						 gint		 value);;
+GOBJECT_FUNC GEnumValue*	g_enum_get_value_by_name	(GEnumClass	*enum_class,
+						 const gchar	*name);;
+GOBJECT_FUNC GEnumValue*	g_enum_get_value_by_nick	(GEnumClass	*enum_class,
+						 const gchar	*nick);;
+GOBJECT_FUNC GFlagsValue*	g_flags_get_first_value		(GFlagsClass	*flags_class,
+						 guint		 value);;
+GOBJECT_FUNC GFlagsValue*	g_flags_get_value_by_name	(GFlagsClass	*flags_class,
+						 const gchar	*name);;
+GOBJECT_FUNC GFlagsValue*	g_flags_get_value_by_nick	(GFlagsClass	*flags_class,
+						 const gchar	*nick);;
+GOBJECT_FUNC void            g_value_set_enum        	(GValue         *value,
+						 gint            v_enum);;
+GOBJECT_FUNC gint            g_value_get_enum        	(const GValue   *value);;
+GOBJECT_FUNC void            g_value_set_flags       	(GValue         *value,
+						 guint           v_flags);;
+GOBJECT_FUNC guint           g_value_get_flags       	(const GValue   *value);;
 
 
 
@@ -106,19 +106,19 @@
 /* const_static_values is a NULL terminated array of enum/flags
  * values that is taken over!
  */
-GType	g_enum_register_static	   (const gchar	      *name,
-				    const GEnumValue  *const_static_values);
-GType	g_flags_register_static	   (const gchar	      *name,
-				    const GFlagsValue *const_static_values);
+GOBJECT_FUNC GType	g_enum_register_static	   (const gchar	      *name,
+				    const GEnumValue  *const_static_values);;
+GOBJECT_FUNC GType	g_flags_register_static	   (const gchar	      *name,
+				    const GFlagsValue *const_static_values);;
 /* functions to complete the type information
  * for enums/flags implemented by plugins
  */
-void	g_enum_complete_type_info  (GType	       g_enum_type,
+GOBJECT_FUNC void	g_enum_complete_type_info  (GType	       g_enum_type,
 				    GTypeInfo	      *info,
-				    const GEnumValue  *const_values);
-void	g_flags_complete_type_info (GType	       g_flags_type,
+				    const GEnumValue  *const_values);;
+GOBJECT_FUNC void	g_flags_complete_type_info (GType	       g_flags_type,
 				    GTypeInfo	      *info,
-				    const GFlagsValue *const_values);
+				    const GFlagsValue *const_values);;
 
 G_END_DECLS
 
--- glib-2.4.6/gobject/glib-genmarshal.c~visibility.patch
+++ glib-2.4.6/gobject/glib-genmarshal.c
@@ -356,7 +356,7 @@
     }
   if (gen_cheader && !have_std_marshaller)
     {
-      ind = g_fprintf (fout, "extern void ");
+      ind = g_fprintf (fout, "GOBJECT_FUNC extern void ");
       ind += g_fprintf (fout, "%s_%s (", marshaller_prefix, signame);
       g_fprintf (fout,   "GClosure     *closure,\n");
       g_fprintf (fout, "%sGValue       *return_value,\n", indent (ind));
--- glib-2.4.6/gobject/gmarshal.c~visibility.patch
+++ glib-2.4.6/gobject/gmarshal.c
@@ -45,7 +45,7 @@
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* VOID:VOID (./gmarshal.list:26) */
+/* VOID:VOID (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:26) */
 void
 g_cclosure_marshal_VOID__VOID (GClosure     *closure,
                                GValue       *return_value,
@@ -78,7 +78,7 @@
             data2);
 }
 
-/* VOID:BOOLEAN (./gmarshal.list:27) */
+/* VOID:BOOLEAN (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:27) */
 void
 g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
                                   GValue       *return_value,
@@ -113,7 +113,7 @@
             data2);
 }
 
-/* VOID:CHAR (./gmarshal.list:28) */
+/* VOID:CHAR (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:28) */
 void
 g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
                                GValue       *return_value,
@@ -148,7 +148,7 @@
             data2);
 }
 
-/* VOID:UCHAR (./gmarshal.list:29) */
+/* VOID:UCHAR (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:29) */
 void
 g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
                                 GValue       *return_value,
@@ -183,7 +183,7 @@
             data2);
 }
 
-/* VOID:INT (./gmarshal.list:30) */
+/* VOID:INT (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:30) */
 void
 g_cclosure_marshal_VOID__INT (GClosure     *closure,
                               GValue       *return_value,
@@ -218,7 +218,7 @@
             data2);
 }
 
-/* VOID:UINT (./gmarshal.list:31) */
+/* VOID:UINT (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:31) */
 void
 g_cclosure_marshal_VOID__UINT (GClosure     *closure,
                                GValue       *return_value,
@@ -253,7 +253,7 @@
             data2);
 }
 
-/* VOID:LONG (./gmarshal.list:32) */
+/* VOID:LONG (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:32) */
 void
 g_cclosure_marshal_VOID__LONG (GClosure     *closure,
                                GValue       *return_value,
@@ -288,7 +288,7 @@
             data2);
 }
 
-/* VOID:ULONG (./gmarshal.list:33) */
+/* VOID:ULONG (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:33) */
 void
 g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
                                 GValue       *return_value,
@@ -323,7 +323,7 @@
             data2);
 }
 
-/* VOID:ENUM (./gmarshal.list:34) */
+/* VOID:ENUM (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:34) */
 void
 g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
                                GValue       *return_value,
@@ -358,7 +358,7 @@
             data2);
 }
 
-/* VOID:FLAGS (./gmarshal.list:35) */
+/* VOID:FLAGS (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:35) */
 void
 g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
                                 GValue       *return_value,
@@ -393,7 +393,7 @@
             data2);
 }
 
-/* VOID:FLOAT (./gmarshal.list:36) */
+/* VOID:FLOAT (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:36) */
 void
 g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
                                 GValue       *return_value,
@@ -428,7 +428,7 @@
             data2);
 }
 
-/* VOID:DOUBLE (./gmarshal.list:37) */
+/* VOID:DOUBLE (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:37) */
 void
 g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
                                  GValue       *return_value,
@@ -463,7 +463,7 @@
             data2);
 }
 
-/* VOID:STRING (./gmarshal.list:38) */
+/* VOID:STRING (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:38) */
 void
 g_cclosure_marshal_VOID__STRING (GClosure     *closure,
                                  GValue       *return_value,
@@ -498,7 +498,7 @@
             data2);
 }
 
-/* VOID:PARAM (./gmarshal.list:39) */
+/* VOID:PARAM (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:39) */
 void
 g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
                                 GValue       *return_value,
@@ -533,7 +533,7 @@
             data2);
 }
 
-/* VOID:BOXED (./gmarshal.list:40) */
+/* VOID:BOXED (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:40) */
 void
 g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
                                 GValue       *return_value,
@@ -568,7 +568,7 @@
             data2);
 }
 
-/* VOID:POINTER (./gmarshal.list:41) */
+/* VOID:POINTER (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:41) */
 void
 g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
                                   GValue       *return_value,
@@ -603,7 +603,7 @@
             data2);
 }
 
-/* VOID:OBJECT (./gmarshal.list:42) */
+/* VOID:OBJECT (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:42) */
 void
 g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
                                  GValue       *return_value,
@@ -638,7 +638,7 @@
             data2);
 }
 
-/* VOID:UINT,POINTER (./gmarshal.list:45) */
+/* VOID:UINT,POINTER (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:45) */
 void
 g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
                                        GValue       *return_value,
@@ -675,7 +675,7 @@
             data2);
 }
 
-/* BOOL:FLAGS (./gmarshal.list:46) */
+/* BOOL:FLAGS (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:46) */
 void
 g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
                                    GValue       *return_value,
@@ -714,7 +714,7 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* STRING:OBJECT,POINTER (./gmarshal.list:47) */
+/* STRING:OBJECT,POINTER (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:47) */
 void
 g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
                                            GValue       *return_value,
--- glib-2.4.6/gobject/gmarshal.h~visibility.patch
+++ glib-2.4.6/gobject/gmarshal.h
@@ -3,166 +3,166 @@
 
 G_BEGIN_DECLS
 
-/* VOID:VOID (./gmarshal.list:26) */
-extern void g_cclosure_marshal_VOID__VOID (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
+/* VOID:VOID (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:26) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__VOID (GClosure     *closure,
+                                                        GValue       *return_value,
+                                                        guint         n_param_values,
+                                                        const GValue *param_values,
+                                                        gpointer      invocation_hint,
+                                                        gpointer      marshal_data);
 
-/* VOID:BOOLEAN (./gmarshal.list:27) */
-extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
-                                              GValue       *return_value,
-                                              guint         n_param_values,
-                                              const GValue *param_values,
-                                              gpointer      invocation_hint,
-                                              gpointer      marshal_data);
+/* VOID:BOOLEAN (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:27) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
+                                                           GValue       *return_value,
+                                                           guint         n_param_values,
+                                                           const GValue *param_values,
+                                                           gpointer      invocation_hint,
+                                                           gpointer      marshal_data);
 
-/* VOID:CHAR (./gmarshal.list:28) */
-extern void g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
+/* VOID:CHAR (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:28) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
+                                                        GValue       *return_value,
+                                                        guint         n_param_values,
+                                                        const GValue *param_values,
+                                                        gpointer      invocation_hint,
+                                                        gpointer      marshal_data);
 
-/* VOID:UCHAR (./gmarshal.list:29) */
-extern void g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
+/* VOID:UCHAR (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:29) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
+                                                         GValue       *return_value,
+                                                         guint         n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer      invocation_hint,
+                                                         gpointer      marshal_data);
 
-/* VOID:INT (./gmarshal.list:30) */
-extern void g_cclosure_marshal_VOID__INT (GClosure     *closure,
-                                          GValue       *return_value,
-                                          guint         n_param_values,
-                                          const GValue *param_values,
-                                          gpointer      invocation_hint,
-                                          gpointer      marshal_data);
+/* VOID:INT (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:30) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__INT (GClosure     *closure,
+                                                       GValue       *return_value,
+                                                       guint         n_param_values,
+                                                       const GValue *param_values,
+                                                       gpointer      invocation_hint,
+                                                       gpointer      marshal_data);
 
-/* VOID:UINT (./gmarshal.list:31) */
-extern void g_cclosure_marshal_VOID__UINT (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
+/* VOID:UINT (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:31) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__UINT (GClosure     *closure,
+                                                        GValue       *return_value,
+                                                        guint         n_param_values,
+                                                        const GValue *param_values,
+                                                        gpointer      invocation_hint,
+                                                        gpointer      marshal_data);
 
-/* VOID:LONG (./gmarshal.list:32) */
-extern void g_cclosure_marshal_VOID__LONG (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
+/* VOID:LONG (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:32) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__LONG (GClosure     *closure,
+                                                        GValue       *return_value,
+                                                        guint         n_param_values,
+                                                        const GValue *param_values,
+                                                        gpointer      invocation_hint,
+                                                        gpointer      marshal_data);
 
-/* VOID:ULONG (./gmarshal.list:33) */
-extern void g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
+/* VOID:ULONG (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:33) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
+                                                         GValue       *return_value,
+                                                         guint         n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer      invocation_hint,
+                                                         gpointer      marshal_data);
 
-/* VOID:ENUM (./gmarshal.list:34) */
-extern void g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
+/* VOID:ENUM (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:34) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
+                                                        GValue       *return_value,
+                                                        guint         n_param_values,
+                                                        const GValue *param_values,
+                                                        gpointer      invocation_hint,
+                                                        gpointer      marshal_data);
 
-/* VOID:FLAGS (./gmarshal.list:35) */
-extern void g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
+/* VOID:FLAGS (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:35) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
+                                                         GValue       *return_value,
+                                                         guint         n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer      invocation_hint,
+                                                         gpointer      marshal_data);
 
-/* VOID:FLOAT (./gmarshal.list:36) */
-extern void g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
+/* VOID:FLOAT (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:36) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
+                                                         GValue       *return_value,
+                                                         guint         n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer      invocation_hint,
+                                                         gpointer      marshal_data);
 
-/* VOID:DOUBLE (./gmarshal.list:37) */
-extern void g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
-                                             GValue       *return_value,
-                                             guint         n_param_values,
-                                             const GValue *param_values,
-                                             gpointer      invocation_hint,
-                                             gpointer      marshal_data);
+/* VOID:DOUBLE (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:37) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
+                                                          GValue       *return_value,
+                                                          guint         n_param_values,
+                                                          const GValue *param_values,
+                                                          gpointer      invocation_hint,
+                                                          gpointer      marshal_data);
 
-/* VOID:STRING (./gmarshal.list:38) */
-extern void g_cclosure_marshal_VOID__STRING (GClosure     *closure,
-                                             GValue       *return_value,
-                                             guint         n_param_values,
-                                             const GValue *param_values,
-                                             gpointer      invocation_hint,
-                                             gpointer      marshal_data);
+/* VOID:STRING (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:38) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__STRING (GClosure     *closure,
+                                                          GValue       *return_value,
+                                                          guint         n_param_values,
+                                                          const GValue *param_values,
+                                                          gpointer      invocation_hint,
+                                                          gpointer      marshal_data);
 
-/* VOID:PARAM (./gmarshal.list:39) */
-extern void g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
+/* VOID:PARAM (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:39) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
+                                                         GValue       *return_value,
+                                                         guint         n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer      invocation_hint,
+                                                         gpointer      marshal_data);
 
-/* VOID:BOXED (./gmarshal.list:40) */
-extern void g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
+/* VOID:BOXED (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:40) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
+                                                         GValue       *return_value,
+                                                         guint         n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer      invocation_hint,
+                                                         gpointer      marshal_data);
 
-/* VOID:POINTER (./gmarshal.list:41) */
-extern void g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
-                                              GValue       *return_value,
-                                              guint         n_param_values,
-                                              const GValue *param_values,
-                                              gpointer      invocation_hint,
-                                              gpointer      marshal_data);
+/* VOID:POINTER (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:41) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
+                                                           GValue       *return_value,
+                                                           guint         n_param_values,
+                                                           const GValue *param_values,
+                                                           gpointer      invocation_hint,
+                                                           gpointer      marshal_data);
 
-/* VOID:OBJECT (./gmarshal.list:42) */
-extern void g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
-                                             GValue       *return_value,
-                                             guint         n_param_values,
-                                             const GValue *param_values,
-                                             gpointer      invocation_hint,
-                                             gpointer      marshal_data);
+/* VOID:OBJECT (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:42) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
+                                                          GValue       *return_value,
+                                                          guint         n_param_values,
+                                                          const GValue *param_values,
+                                                          gpointer      invocation_hint,
+                                                          gpointer      marshal_data);
 
-/* VOID:UINT,POINTER (./gmarshal.list:45) */
-extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
-                                                   GValue       *return_value,
-                                                   guint         n_param_values,
-                                                   const GValue *param_values,
-                                                   gpointer      invocation_hint,
-                                                   gpointer      marshal_data);
+/* VOID:UINT,POINTER (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:45) */
+GOBJECT_FUNC extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
+                                                                GValue       *return_value,
+                                                                guint         n_param_values,
+                                                                const GValue *param_values,
+                                                                gpointer      invocation_hint,
+                                                                gpointer      marshal_data);
 
-/* BOOL:FLAGS (./gmarshal.list:46) */
-extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
-                                               GValue       *return_value,
-                                               guint         n_param_values,
-                                               const GValue *param_values,
-                                               gpointer      invocation_hint,
-                                               gpointer      marshal_data);
+/* BOOL:FLAGS (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:46) */
+GOBJECT_FUNC extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
+                                                            GValue       *return_value,
+                                                            guint         n_param_values,
+                                                            const GValue *param_values,
+                                                            gpointer      invocation_hint,
+                                                            gpointer      marshal_data);
 #define g_cclosure_marshal_BOOL__FLAGS	g_cclosure_marshal_BOOLEAN__FLAGS
 
-/* STRING:OBJECT,POINTER (./gmarshal.list:47) */
-extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
+/* STRING:OBJECT,POINTER (/home/kergoth/code/build-z/tmp/work/arm-linux/glib-2.0-2.4.6-r2/glib-2.4.6/gobject/gmarshal.list:47) */
+GOBJECT_FUNC extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
+                                                                    GValue       *return_value,
+                                                                    guint         n_param_values,
+                                                                    const GValue *param_values,
+                                                                    gpointer      invocation_hint,
+                                                                    gpointer      marshal_data);
 
 G_END_DECLS
 
--- glib-2.4.6/gobject/gobject.def~visibility.patch
+++ glib-2.4.6/gobject/gobject.def
@@ -1,4 +1,3 @@
-EXPORTS
 	g_boxed_copy
 	g_boxed_free
 	g_boxed_type_register_static
--- glib-2.4.6/gobject/gobject.h~visibility.patch
+++ glib-2.4.6/gobject/gobject.h
@@ -28,6 +28,7 @@
 #include        <gobject/gparam.h>
 #include        <gobject/gclosure.h>
 #include        <gobject/gsignal.h>
+#include        <gobject/gparamspecs.h>
 
 G_BEGIN_DECLS
 
@@ -111,123 +112,123 @@
 
 
 /* --- prototypes --- */
-void        g_object_class_install_property   (GObjectClass   *oclass,
+GOBJECT_FUNC void        g_object_class_install_property   (GObjectClass   *oclass,
 					       guint           property_id,
-					       GParamSpec     *pspec);
-GParamSpec* g_object_class_find_property      (GObjectClass   *oclass,
-					       const gchar    *property_name);
-GParamSpec**g_object_class_list_properties    (GObjectClass   *oclass,
+					       GParamSpec     *pspec);;
+GOBJECT_FUNC GParamSpec* g_object_class_find_property      (GObjectClass   *oclass,
+					       const gchar    *property_name);;
+GOBJECT_FUNC GParamSpec**g_object_class_list_properties    (GObjectClass   *oclass,
 					       guint	      *n_properties);
-void        g_object_class_override_property  (GObjectClass   *oclass,
+GOBJECT_FUNC void        g_object_class_override_property  (GObjectClass   *oclass,
 					       guint           property_id,
-					       const gchar    *name);
+					       const gchar    *name);;
 
-void        g_object_interface_install_property (gpointer     g_iface,
-						 GParamSpec  *pspec);
-GParamSpec* g_object_interface_find_property    (gpointer     g_iface,
-						 const gchar *property_name);
-GParamSpec**g_object_interface_list_properties  (gpointer     g_iface,
+GOBJECT_FUNC void        g_object_interface_install_property (gpointer     g_iface,
+						 GParamSpec  *pspec);;
+GOBJECT_FUNC GParamSpec* g_object_interface_find_property    (gpointer     g_iface,
+						 const gchar *property_name);;
+GOBJECT_FUNC GParamSpec**g_object_interface_list_properties  (gpointer     g_iface,
 						 guint       *n_properties_p);
 
-gpointer    g_object_new                      (GType           object_type,
+GOBJECT_FUNC gpointer    g_object_new                      (GType           object_type,
 					       const gchar    *first_property_name,
-					       ...);
-gpointer    g_object_newv		      (GType           object_type,
+					       ...);;
+GOBJECT_FUNC gpointer    g_object_newv		      (GType           object_type,
 					       guint	       n_parameters,
-					       GParameter     *parameters);
-GObject*    g_object_new_valist               (GType           object_type,
+					       GParameter     *parameters);;
+GOBJECT_FUNC GObject*    g_object_new_valist               (GType           object_type,
 					       const gchar    *first_property_name,
-					       va_list         var_args);
-void	    g_object_set                      (gpointer	       object,
+					       va_list         var_args);;
+GOBJECT_FUNC void	    g_object_set                      (gpointer	       object,
 					       const gchar    *first_property_name,
-					       ...);
-void        g_object_get                      (gpointer        object,
+					       ...);;
+GOBJECT_FUNC void        g_object_get                      (gpointer        object,
 					       const gchar    *first_property_name,
-					       ...);
-gpointer    g_object_connect                  (gpointer	       object,
+					       ...);;
+GOBJECT_FUNC gpointer    g_object_connect                  (gpointer	       object,
 					       const gchar    *signal_spec,
-					       ...);
-void	    g_object_disconnect               (gpointer	       object,
+					       ...);;
+GOBJECT_FUNC void	    g_object_disconnect               (gpointer	       object,
 					       const gchar    *signal_spec,
-					       ...);
-void        g_object_set_valist               (GObject        *object,
+					       ...);;
+GOBJECT_FUNC void        g_object_set_valist               (GObject        *object,
 					       const gchar    *first_property_name,
-					       va_list         var_args);
-void        g_object_get_valist               (GObject        *object,
+					       va_list         var_args);;
+GOBJECT_FUNC void        g_object_get_valist               (GObject        *object,
 					       const gchar    *first_property_name,
-					       va_list         var_args);
-void        g_object_set_property             (GObject        *object,
+					       va_list         var_args);;
+GOBJECT_FUNC void        g_object_set_property             (GObject        *object,
 					       const gchar    *property_name,
-					       const GValue   *value);
-void        g_object_get_property             (GObject        *object,
+					       const GValue   *value);;
+GOBJECT_FUNC void        g_object_get_property             (GObject        *object,
 					       const gchar    *property_name,
-					       GValue         *value);
-void        g_object_freeze_notify            (GObject        *object);
-void        g_object_notify                   (GObject        *object,
-					       const gchar    *property_name);
-void        g_object_thaw_notify              (GObject        *object);
-gpointer    g_object_ref                      (gpointer        object);
-void        g_object_unref                    (gpointer        object);
-void	    g_object_weak_ref		      (GObject	      *object,
+					       GValue         *value);;
+GOBJECT_FUNC void        g_object_freeze_notify            (GObject        *object);;
+GOBJECT_FUNC void        g_object_notify                   (GObject        *object,
+					       const gchar    *property_name);;
+GOBJECT_FUNC void        g_object_thaw_notify              (GObject        *object);;
+GOBJECT_FUNC gpointer    g_object_ref                      (gpointer        object);;
+GOBJECT_FUNC void        g_object_unref                    (gpointer        object);;
+GOBJECT_FUNC void	    g_object_weak_ref		      (GObject	      *object,
 					       GWeakNotify     notify,
-					       gpointer	       data);
-void	    g_object_weak_unref		      (GObject	      *object,
+					       gpointer	       data);;
+GOBJECT_FUNC void	    g_object_weak_unref		      (GObject	      *object,
 					       GWeakNotify     notify,
-					       gpointer	       data);
-void        g_object_add_weak_pointer         (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-void        g_object_remove_weak_pointer      (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-gpointer    g_object_get_qdata                (GObject        *object,
-					       GQuark          quark);
-void        g_object_set_qdata                (GObject        *object,
+					       gpointer	       data);;
+GOBJECT_FUNC void        g_object_add_weak_pointer         (GObject        *object, 
+                                               gpointer       *weak_pointer_location);;
+GOBJECT_FUNC void        g_object_remove_weak_pointer      (GObject        *object, 
+                                               gpointer       *weak_pointer_location);;
+GOBJECT_FUNC gpointer    g_object_get_qdata                (GObject        *object,
+					       GQuark          quark);;
+GOBJECT_FUNC void        g_object_set_qdata                (GObject        *object,
 					       GQuark          quark,
-					       gpointer        data);
-void        g_object_set_qdata_full           (GObject        *object,
+					       gpointer        data);;
+GOBJECT_FUNC void        g_object_set_qdata_full           (GObject        *object,
 					       GQuark          quark,
 					       gpointer        data,
-					       GDestroyNotify  destroy);
-gpointer    g_object_steal_qdata              (GObject        *object,
-					       GQuark          quark);
-gpointer    g_object_get_data                 (GObject        *object,
-					       const gchar    *key);
-void        g_object_set_data                 (GObject        *object,
+					       GDestroyNotify  destroy);;
+GOBJECT_FUNC gpointer    g_object_steal_qdata              (GObject        *object,
+					       GQuark          quark);;
+GOBJECT_FUNC gpointer    g_object_get_data                 (GObject        *object,
+					       const gchar    *key);;
+GOBJECT_FUNC void        g_object_set_data                 (GObject        *object,
 					       const gchar    *key,
-					       gpointer        data);
-void        g_object_set_data_full            (GObject        *object,
+					       gpointer        data);;
+GOBJECT_FUNC void        g_object_set_data_full            (GObject        *object,
 					       const gchar    *key,
 					       gpointer        data,
-					       GDestroyNotify  destroy);
-gpointer    g_object_steal_data               (GObject        *object,
-					       const gchar    *key);
-void        g_object_watch_closure            (GObject        *object,
-					       GClosure       *closure);
-GClosure*   g_cclosure_new_object             (GCallback       callback_func,
-					       GObject	      *object);
-GClosure*   g_cclosure_new_object_swap        (GCallback       callback_func,
-					       GObject	      *object);
-GClosure*   g_closure_new_object              (guint           sizeof_closure,
-					       GObject        *object);
-void        g_value_set_object                (GValue         *value,
-					       gpointer        v_object);
-gpointer    g_value_get_object                (const GValue   *value);
-GObject*    g_value_dup_object                (const GValue   *value);
-gulong	    g_signal_connect_object           (gpointer	       instance,
+					       GDestroyNotify  destroy);;
+GOBJECT_FUNC gpointer    g_object_steal_data               (GObject        *object,
+					       const gchar    *key);;
+GOBJECT_FUNC void        g_object_watch_closure            (GObject        *object,
+					       GClosure       *closure);;
+GOBJECT_FUNC GClosure*   g_cclosure_new_object             (GCallback       callback_func,
+					       GObject	      *object);;
+GOBJECT_FUNC GClosure*   g_cclosure_new_object_swap        (GCallback       callback_func,
+					       GObject	      *object);;
+GOBJECT_FUNC GClosure*   g_closure_new_object              (guint           sizeof_closure,
+					       GObject        *object);;
+GOBJECT_FUNC void        g_value_set_object                (GValue         *value,
+					       gpointer        v_object);;
+GOBJECT_FUNC gpointer    g_value_get_object                (const GValue   *value);;
+GOBJECT_FUNC GObject*    g_value_dup_object                (const GValue   *value);;
+GOBJECT_FUNC gulong	    g_signal_connect_object           (gpointer	       instance,
 					       const gchar    *detailed_signal,
 					       GCallback       c_handler,
 					       gpointer	       gobject,
-					       GConnectFlags   connect_flags);
+					       GConnectFlags   connect_flags);;
 
 
 /*< protected >*/
-void        g_object_run_dispose	      (GObject	      *object);
+GOBJECT_FUNC void        g_object_run_dispose	      (GObject	      *object);;
 
 
-void        g_value_take_object               (GValue         *value,
-					       gpointer        v_object);
+GOBJECT_FUNC void        g_value_take_object               (GValue         *value,
+					       gpointer        v_object);;
 #ifndef G_DISABLE_DEPRECATED
-void        g_value_set_object_take_ownership (GValue         *value,
-					       gpointer        v_object);
+GOBJECT_FUNC void        g_value_set_object_take_ownership (GValue         *value,
+					       gpointer        v_object);;
 #endif
 
 /* --- implementation macros --- */
--- glib-2.4.6/gobject/gparam.h~visibility.patch
+++ glib-2.4.6/gobject/gparam.h
@@ -109,49 +109,49 @@
 
 
 /* --- prototypes --- */
-GParamSpec*	g_param_spec_ref		(GParamSpec    *pspec);
-void		g_param_spec_unref		(GParamSpec    *pspec);
-void		g_param_spec_sink		(GParamSpec    *pspec);
-gpointer        g_param_spec_get_qdata		(GParamSpec    *pspec,
-						 GQuark         quark);
-void            g_param_spec_set_qdata		(GParamSpec    *pspec,
+GOBJECT_FUNC GParamSpec*	g_param_spec_ref		(GParamSpec    *pspec);;
+GOBJECT_FUNC void		g_param_spec_unref		(GParamSpec    *pspec);;
+GOBJECT_FUNC void		g_param_spec_sink		(GParamSpec    *pspec);;
+GOBJECT_FUNC gpointer        g_param_spec_get_qdata		(GParamSpec    *pspec,
+						 GQuark         quark);;
+GOBJECT_FUNC void            g_param_spec_set_qdata		(GParamSpec    *pspec,
 						 GQuark         quark,
-						 gpointer       data);
-void            g_param_spec_set_qdata_full	(GParamSpec    *pspec,
+						 gpointer       data);;
+GOBJECT_FUNC void            g_param_spec_set_qdata_full	(GParamSpec    *pspec,
 						 GQuark         quark,
 						 gpointer       data,
-						 GDestroyNotify destroy);
-gpointer        g_param_spec_steal_qdata	(GParamSpec    *pspec,
-						 GQuark         quark);
-GParamSpec*     g_param_spec_get_redirect_target (GParamSpec   *pspec);
+						 GDestroyNotify destroy);;
+GOBJECT_FUNC gpointer        g_param_spec_steal_qdata	(GParamSpec    *pspec,
+						 GQuark         quark);;
+GOBJECT_FUNC GParamSpec*     g_param_spec_get_redirect_target (GParamSpec   *pspec);;
 
-void		g_param_value_set_default	(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_defaults		(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_validate		(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_convert		(GParamSpec    *pspec,
+GOBJECT_FUNC void		g_param_value_set_default	(GParamSpec    *pspec,
+						 GValue	       *value);;
+GOBJECT_FUNC gboolean	g_param_value_defaults		(GParamSpec    *pspec,
+						 GValue	       *value);;
+GOBJECT_FUNC gboolean	g_param_value_validate		(GParamSpec    *pspec,
+						 GValue	       *value);;
+GOBJECT_FUNC gboolean	g_param_value_convert		(GParamSpec    *pspec,
 						 const GValue  *src_value,
 						 GValue	       *dest_value,
-						 gboolean	strict_validation);
-gint		g_param_values_cmp		(GParamSpec    *pspec,
+						 gboolean	strict_validation);;
+GOBJECT_FUNC gint		g_param_values_cmp		(GParamSpec    *pspec,
 						 const GValue  *value1,
-						 const GValue  *value2);
-G_CONST_RETURN gchar*	g_param_spec_get_name	(GParamSpec    *pspec);
-G_CONST_RETURN gchar*	g_param_spec_get_nick	(GParamSpec    *pspec);
-G_CONST_RETURN gchar*	g_param_spec_get_blurb	(GParamSpec    *pspec);
-void            g_value_set_param               (GValue	       *value,
-						 GParamSpec    *param);
-GParamSpec*     g_value_get_param               (const GValue  *value);
-GParamSpec*     g_value_dup_param               (const GValue  *value);
+						 const GValue  *value2);;
+GOBJECT_FUNC G_CONST_RETURN gchar*	g_param_spec_get_name	(GParamSpec    *pspec);;
+GOBJECT_FUNC G_CONST_RETURN gchar*	g_param_spec_get_nick	(GParamSpec    *pspec);;
+GOBJECT_FUNC G_CONST_RETURN gchar*	g_param_spec_get_blurb	(GParamSpec    *pspec);;
+GOBJECT_FUNC void            g_value_set_param               (GValue	       *value,
+						 GParamSpec    *param);;
+GOBJECT_FUNC GParamSpec*     g_value_get_param               (const GValue  *value);;
+GOBJECT_FUNC GParamSpec*     g_value_dup_param               (const GValue  *value);;
 
 
-void           g_value_take_param               (GValue        *value,
-					         GParamSpec    *param);
+GOBJECT_FUNC void           g_value_take_param               (GValue        *value,
+					         GParamSpec    *param);;
 #ifndef G_DISABLE_DEPRECATED
-void           g_value_set_param_take_ownership (GValue        *value,
-					         GParamSpec    *param);
+GOBJECT_FUNC void           g_value_set_param_take_ownership (GValue        *value,
+					         GParamSpec    *param);;
 #endif
 
 /* --- convenience functions --- */
@@ -174,36 +174,36 @@
 					 const GValue *value1,
 					 const GValue *value2);
 };
-GType	g_param_type_register_static	(const gchar		  *name,
-					 const GParamSpecTypeInfo *pspec_info);
+GOBJECT_FUNC GType	g_param_type_register_static	(const gchar		  *name,
+					 const GParamSpecTypeInfo *pspec_info);;
 
 /* For registering builting types */
-GType  _g_param_type_register_static_constant (const gchar              *name,
+GOBJECT_FUNC GType  _g_param_type_register_static_constant (const gchar              *name,
 					       const GParamSpecTypeInfo *pspec_info,
 					       GType                     opt_type);
 
 
 /* --- protected --- */
-gpointer	g_param_spec_internal		(GType	        param_type,
+GOBJECT_FUNC gpointer	g_param_spec_internal		(GType	        param_type,
 						 const gchar   *name,
 						 const gchar   *nick,
 						 const gchar   *blurb,
-						 GParamFlags    flags);
-GParamSpecPool* g_param_spec_pool_new		(gboolean	type_prefixing);
-void		g_param_spec_pool_insert	(GParamSpecPool	*pool,
+						 GParamFlags    flags);;
+GOBJECT_FUNC GParamSpecPool* g_param_spec_pool_new		(gboolean	type_prefixing);;
+GOBJECT_FUNC void		g_param_spec_pool_insert	(GParamSpecPool	*pool,
 						 GParamSpec	*pspec,
-						 GType		 owner_type);
-void		g_param_spec_pool_remove	(GParamSpecPool	*pool,
-						 GParamSpec	*pspec);
-GParamSpec*	g_param_spec_pool_lookup	(GParamSpecPool	*pool,
+						 GType		 owner_type);;
+GOBJECT_FUNC void		g_param_spec_pool_remove	(GParamSpecPool	*pool,
+						 GParamSpec	*pspec);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_pool_lookup	(GParamSpecPool	*pool,
 						 const gchar	*param_name,
 						 GType		 owner_type,
-						 gboolean	 walk_ancestors);
-GList*		g_param_spec_pool_list_owned	(GParamSpecPool	*pool,
-						 GType		 owner_type);
-GParamSpec**	g_param_spec_pool_list		(GParamSpecPool	*pool,
+						 gboolean	 walk_ancestors);;
+GOBJECT_FUNC GList*		g_param_spec_pool_list_owned	(GParamSpecPool	*pool,
+						 GType		 owner_type);;
+GOBJECT_FUNC GParamSpec**	g_param_spec_pool_list		(GParamSpecPool	*pool,
 						 GType		 owner_type,
-						 guint		*n_pspecs_p);
+						 guint		*n_pspecs_p);;
 
 
 
--- glib-2.4.6/gobject/gparamspecs.h~visibility.patch
+++ glib-2.4.6/gobject/gparamspecs.h
@@ -270,154 +270,130 @@
 };
 
 /* --- GParamSpec prototypes --- */
-GParamSpec*	g_param_spec_char	 (const gchar	 *name,
+GOBJECT_FUNC GParamSpec*	g_param_spec_char	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  gint8		  minimum,
 					  gint8		  maximum,
 					  gint8		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uchar	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_uchar	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  guint8	  minimum,
 					  guint8	  maximum,
 					  guint8	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_boolean	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_boolean	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  gboolean	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_int	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_int	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  gint		  minimum,
 					  gint		  maximum,
 					  gint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uint	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_uint	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  guint		  minimum,
 					  guint		  maximum,
 					  guint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_long	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_long	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  glong		  minimum,
 					  glong		  maximum,
 					  glong		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_ulong	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_ulong	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  gulong	  minimum,
 					  gulong	  maximum,
 					  gulong	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_int64	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_int64	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  gint64       	  minimum,
 					  gint64       	  maximum,
 					  gint64       	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uint64	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_uint64	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  guint64	  minimum,
 					  guint64	  maximum,
 					  guint64	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*    g_param_spec_unichar      (const gchar    *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*    g_param_spec_unichar      (const gchar    *name,
 				          const gchar    *nick,
 				          const gchar    *blurb,
 				          gunichar	  default_value,
-				          GParamFlags     flags);
-GParamSpec*	g_param_spec_enum	 (const gchar	 *name,
+				          GParamFlags     flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_enum	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  GType		  enum_type,
 					  gint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_flags	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_flags	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  GType		  flags_type,
 					  guint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_float	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_float	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  gfloat	  minimum,
 					  gfloat	  maximum,
 					  gfloat	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_double	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_double	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  gdouble	  minimum,
 					  gdouble	  maximum,
 					  gdouble	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_string	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_string	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  const gchar	 *default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_param	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_param	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  GType		  param_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_boxed	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_boxed	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  GType		  boxed_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_pointer	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_pointer	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_value_array (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_value_array (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  GParamSpec	 *element_spec,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_object	 (const gchar	 *name,
+					  GParamFlags	  flags);;
+GOBJECT_FUNC GParamSpec*	g_param_spec_object	 (const gchar	 *name,
 					  const gchar	 *nick,
 					  const gchar	 *blurb,
 					  GType		  object_type,
-					  GParamFlags	  flags);
-
-GParamSpec*     g_param_spec_override    (const gchar    *name,
-					  GParamSpec     *overridden);
+					  GParamFlags	  flags);;
 
-/* --- internal --- */
-/* We prefix variable declarations so they can
- * properly get exported in windows dlls.
- */
-#ifndef GOBJECT_VAR
-#  ifdef G_PLATFORM_WIN32
-#    ifdef GOBJECT_STATIC_COMPILATION
-#      define GOBJECT_VAR extern
-#    else /* !GOBJECT_STATIC_COMPILATION */
-#      ifdef GOBJECT_COMPILATION
-#        ifdef DLL_EXPORT
-#          define GOBJECT_VAR __declspec(dllexport)
-#        else /* !DLL_EXPORT */
-#          define GOBJECT_VAR extern
-#        endif /* !DLL_EXPORT */
-#      else /* !GOBJECT_COMPILATION */
-#        define GOBJECT_VAR extern __declspec(dllimport)
-#      endif /* !GOBJECT_COMPILATION */
-#    endif /* !GOBJECT_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
-#    define GOBJECT_VAR extern
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GOBJECT_VAR */
+GOBJECT_FUNC GParamSpec*     g_param_spec_override    (const gchar    *name,
+					  GParamSpec     *overridden);;
 
 GOBJECT_VAR GType *g_param_spec_types;
 
--- glib-2.4.6/gobject/gsignal.h~visibility.patch
+++ glib-2.4.6/gobject/gsignal.h
@@ -94,7 +94,7 @@
 
 
 /* --- signals --- */
-guint                 g_signal_newv         (const gchar        *signal_name,
+GOBJECT_FUNC guint                 g_signal_newv         (const gchar        *signal_name,
 					     GType               itype,
 					     GSignalFlags        signal_flags,
 					     GClosure           *class_closure,
@@ -103,8 +103,8 @@
 					     GSignalCMarshaller  c_marshaller,
 					     GType               return_type,
 					     guint               n_params,
-					     GType              *param_types);
-guint                 g_signal_new_valist   (const gchar        *signal_name,
+					     GType              *param_types);;
+GOBJECT_FUNC guint                 g_signal_new_valist   (const gchar        *signal_name,
 					     GType               itype,
 					     GSignalFlags        signal_flags,
 					     GClosure           *class_closure,
@@ -113,8 +113,8 @@
 					     GSignalCMarshaller  c_marshaller,
 					     GType               return_type,
 					     guint               n_params,
-					     va_list             args);
-guint                 g_signal_new          (const gchar        *signal_name,
+					     va_list             args);;
+GOBJECT_FUNC guint                 g_signal_new          (const gchar        *signal_name,
 					     GType               itype,
 					     GSignalFlags        signal_flags,
 					     guint               class_offset,
@@ -123,116 +123,116 @@
 					     GSignalCMarshaller  c_marshaller,
 					     GType               return_type,
 					     guint               n_params,
-					     ...);
-void                  g_signal_emitv        (const GValue       *instance_and_params,
+					     ...);;
+GOBJECT_FUNC void                  g_signal_emitv        (const GValue       *instance_and_params,
 					     guint               signal_id,
 					     GQuark              detail,
-					     GValue             *return_value);
-void                  g_signal_emit_valist  (gpointer            instance,
+					     GValue             *return_value);;
+GOBJECT_FUNC void                  g_signal_emit_valist  (gpointer            instance,
 					     guint               signal_id,
 					     GQuark              detail,
-					     va_list             var_args);
-void                  g_signal_emit         (gpointer            instance,
+					     va_list             var_args);;
+GOBJECT_FUNC void                  g_signal_emit         (gpointer            instance,
 					     guint               signal_id,
 					     GQuark              detail,
-					     ...);
-void                  g_signal_emit_by_name (gpointer            instance,
+					     ...);;
+GOBJECT_FUNC void                  g_signal_emit_by_name (gpointer            instance,
 					     const gchar        *detailed_signal,
-					     ...);
-guint                 g_signal_lookup       (const gchar        *name,
-					     GType               itype);
-G_CONST_RETURN gchar* g_signal_name         (guint               signal_id);
-void                  g_signal_query        (guint               signal_id,
-					     GSignalQuery       *query);
-guint*                g_signal_list_ids     (GType               itype,
-					     guint              *n_ids);
-gboolean	      g_signal_parse_name   (const gchar	*detailed_signal,
+					     ...);;
+GOBJECT_FUNC guint                 g_signal_lookup       (const gchar        *name,
+					     GType               itype);;
+GOBJECT_FUNC G_CONST_RETURN gchar* g_signal_name         (guint               signal_id);;
+GOBJECT_FUNC void                  g_signal_query        (guint               signal_id,
+					     GSignalQuery       *query);;
+GOBJECT_FUNC guint*                g_signal_list_ids     (GType               itype,
+					     guint              *n_ids);;
+GOBJECT_FUNC gboolean	      g_signal_parse_name   (const gchar	*detailed_signal,
 					     GType		 itype,
 					     guint		*signal_id_p,
 					     GQuark		*detail_p,
-					     gboolean		 force_detail_quark);
-GSignalInvocationHint* g_signal_get_invocation_hint (gpointer    instance);
+					     gboolean		 force_detail_quark);;
+GOBJECT_FUNC GSignalInvocationHint* g_signal_get_invocation_hint (gpointer    instance);;
 
 
 /* --- signal emissions --- */
-void	g_signal_stop_emission		    (gpointer		  instance,
+GOBJECT_FUNC void	g_signal_stop_emission		    (gpointer		  instance,
 					     guint		  signal_id,
-					     GQuark		  detail);
-void	g_signal_stop_emission_by_name	    (gpointer		  instance,
-					     const gchar	 *detailed_signal);
-gulong	g_signal_add_emission_hook	    (guint		  signal_id,
+					     GQuark		  detail);;
+GOBJECT_FUNC void	g_signal_stop_emission_by_name	    (gpointer		  instance,
+					     const gchar	 *detailed_signal);;
+GOBJECT_FUNC gulong	g_signal_add_emission_hook	    (guint		  signal_id,
 					     GQuark		  detail,
 					     GSignalEmissionHook  hook_func,
 					     gpointer	       	  hook_data,
-					     GDestroyNotify	  data_destroy);
-void	g_signal_remove_emission_hook	    (guint		  signal_id,
-					     gulong		  hook_id);
+					     GDestroyNotify	  data_destroy);;
+GOBJECT_FUNC void	g_signal_remove_emission_hook	    (guint		  signal_id,
+					     gulong		  hook_id);;
 
 
 /* --- signal handlers --- */
-gboolean g_signal_has_handler_pending	      (gpointer		  instance,
+GOBJECT_FUNC gboolean g_signal_has_handler_pending	      (gpointer		  instance,
 					       guint		  signal_id,
 					       GQuark		  detail,
-					       gboolean		  may_be_blocked);
-gulong	 g_signal_connect_closure_by_id	      (gpointer		  instance,
+					       gboolean		  may_be_blocked);;
+GOBJECT_FUNC gulong	 g_signal_connect_closure_by_id	      (gpointer		  instance,
 					       guint		  signal_id,
 					       GQuark		  detail,
 					       GClosure		 *closure,
-					       gboolean		  after);
-gulong	 g_signal_connect_closure	      (gpointer		  instance,
+					       gboolean		  after);;
+GOBJECT_FUNC gulong	 g_signal_connect_closure	      (gpointer		  instance,
 					       const gchar       *detailed_signal,
 					       GClosure		 *closure,
-					       gboolean		  after);
-gulong	 g_signal_connect_data		      (gpointer		  instance,
+					       gboolean		  after);;
+GOBJECT_FUNC gulong	 g_signal_connect_data		      (gpointer		  instance,
 					       const gchar	 *detailed_signal,
 					       GCallback	  c_handler,
 					       gpointer		  data,
 					       GClosureNotify	  destroy_data,
-					       GConnectFlags	  connect_flags);
-void	 g_signal_handler_block		      (gpointer		  instance,
-					       gulong		  handler_id);
-void	 g_signal_handler_unblock	      (gpointer		  instance,
-					       gulong		  handler_id);
-void	 g_signal_handler_disconnect	      (gpointer		  instance,
-					       gulong		  handler_id);
-gboolean g_signal_handler_is_connected	      (gpointer		  instance,
-					       gulong		  handler_id);
-gulong	 g_signal_handler_find		      (gpointer		  instance,
+					       GConnectFlags	  connect_flags);;
+GOBJECT_FUNC void	 g_signal_handler_block		      (gpointer		  instance,
+					       gulong		  handler_id);;
+GOBJECT_FUNC void	 g_signal_handler_unblock	      (gpointer		  instance,
+					       gulong		  handler_id);;
+GOBJECT_FUNC void	 g_signal_handler_disconnect	      (gpointer		  instance,
+					       gulong		  handler_id);;
+GOBJECT_FUNC gboolean g_signal_handler_is_connected	      (gpointer		  instance,
+					       gulong		  handler_id);;
+GOBJECT_FUNC gulong	 g_signal_handler_find		      (gpointer		  instance,
 					       GSignalMatchType	  mask,
 					       guint		  signal_id,
 					       GQuark		  detail,
 					       GClosure		 *closure,
 					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_block_matched      (gpointer		  instance,
+					       gpointer		  data);;
+GOBJECT_FUNC guint	 g_signal_handlers_block_matched      (gpointer		  instance,
 					       GSignalMatchType	  mask,
 					       guint		  signal_id,
 					       GQuark		  detail,
 					       GClosure		 *closure,
 					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_unblock_matched    (gpointer		  instance,
+					       gpointer		  data);;
+GOBJECT_FUNC guint	 g_signal_handlers_unblock_matched    (gpointer		  instance,
 					       GSignalMatchType	  mask,
 					       guint		  signal_id,
 					       GQuark		  detail,
 					       GClosure		 *closure,
 					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_disconnect_matched (gpointer		  instance,
+					       gpointer		  data);;
+GOBJECT_FUNC guint	 g_signal_handlers_disconnect_matched (gpointer		  instance,
 					       GSignalMatchType	  mask,
 					       guint		  signal_id,
 					       GQuark		  detail,
 					       GClosure		 *closure,
 					       gpointer		  func,
-					       gpointer		  data);
+					       gpointer		  data);;
 
 
 /* --- chaining for language bindings --- */
-void	g_signal_override_class_closure	      (guint		  signal_id,
+GOBJECT_FUNC void	g_signal_override_class_closure	      (guint		  signal_id,
 					       GType		  instance_type,
-					       GClosure		 *class_closure);
-void	g_signal_chain_from_overridden	      (const GValue      *instance_and_params,
-					       GValue            *return_value);
+					       GClosure		 *class_closure);;
+GOBJECT_FUNC void	g_signal_chain_from_overridden	      (const GValue      *instance_and_params,
+					       GValue            *return_value);;
 
 
 /* --- convenience --- */
@@ -256,13 +256,13 @@
 				          0, 0, NULL, (func), (data))
 
 
-gboolean g_signal_accumulator_true_handled (GSignalInvocationHint *ihint,
+GOBJECT_FUNC gboolean g_signal_accumulator_true_handled (GSignalInvocationHint *ihint,
 					    GValue                *return_accu,
 					    const GValue          *handler_return,
-					    gpointer               dummy);
+					    gpointer               dummy);;
 
 /*< private >*/
-void	 g_signal_handlers_destroy	      (gpointer		  instance);
+GOBJECT_FUNC void	 g_signal_handlers_destroy	      (gpointer		  instance);;
 void	 _g_signals_destroy		      (GType		  itype);
 
 G_END_DECLS
--- glib-2.4.6/gobject/gsourceclosure.h~visibility.patch
+++ glib-2.4.6/gobject/gsourceclosure.h
@@ -27,11 +27,11 @@
 
 G_BEGIN_DECLS
 
-void g_source_set_closure (GSource  *source,
-			   GClosure *closure);
+GOBJECT_FUNC void g_source_set_closure (GSource  *source,
+			   GClosure *closure);;
 
-GType g_io_channel_get_type   (void);
-GType g_io_condition_get_type (void);
+GOBJECT_FUNC GType g_io_channel_get_type   (void);;
+GOBJECT_FUNC GType g_io_condition_get_type (void);;
 
 #define G_TYPE_IO_CHANNEL (g_io_channel_get_type ())
 #define G_TYPE_IO_CONDITION (g_io_condition_get_type ())
--- glib-2.4.6/gobject/gtype.h~visibility.patch
+++ glib-2.4.6/gobject/gtype.h
@@ -27,6 +27,63 @@
 
 G_BEGIN_DECLS
 
+/* We prefix variable declarations so they can
+ * properly get exported in windows dlls.
+ */
+#ifndef GOBJECT_VAR
+#  ifdef G_PLATFORM_WIN32
+#    ifdef GOBJECT_STATIC_COMPILATION
+#      define GOBJECT_VAR extern
+#    else /* !GOBJECT_STATIC_COMPILATION */
+#      ifdef GOBJECT_COMPILATION
+#        ifdef DLL_EXPORT
+#          define GOBJECT_VAR __declspec(dllexport)
+#        else /* !DLL_EXPORT */
+#          define GOBJECT_VAR extern
+#        endif /* !DLL_EXPORT */
+#      else /* !GOBJECT_COMPILATION */
+#        define GOBJECT_VAR extern __declspec(dllimport)
+#      endif /* !GOBJECT_COMPILATION */
+#    endif /* !GOBJECT_STATIC_COMPILATION */
+#  else /* !G_PLATFORM_WIN32 */
+#    ifdef GOBJECT_STATIC_COMPILATION
+#      define GOBJECT_VAR extern
+#    else /* !GOBJECT_STATIC_COMPILATION */
+#      ifdef GOBJECT_COMPILATION
+#        ifdef GCC_HASCLASSVISIBILITY
+#          define GOBJECT_VAR __attribute__ ((visibility("default")))
+#        endif
+#      endif /* !GOBJECT_COMPILATION */
+#    endif /* !GOBJECT_STATIC_COMPILATION */
+#    ifndef GOBJECT_VAR
+#      define GOBJECT_VAR extern
+#    endif /* !GOBJECT_VAR */
+#  endif /* !G_PLATFORM_WIN32 */
+#endif /* GOBJECT_VAR */
+
+#ifndef GOBJECT_FUNC
+#  ifdef G_PLATFORM_WIN32
+#    ifndef GOBJECT_STATIC_COMPILATION
+#      ifdef GOBJECT_COMPILATION
+#        define GOBJECT_FUNC __declspec(dllexport)
+#      else /* !GOBJECT_COMPILATION */
+#        define GOBJECT_FUNC __declspec(dllimport)
+#      endif /* !GOBJECT_COMPILATION */
+#    endif /* !GOBJECT_STATIC_COMPILATION */
+#  else /* !G_PLATFORM_WIN32 */
+#    ifndef GOBJECT_STATIC_COMPILATION
+#      ifdef GOBJECT_COMPILATION
+#        ifdef GCC_HASCLASSVISIBILITY
+#          define GOBJECT_FUNC __attribute__ ((visibility("default")))
+#        endif
+#      endif /* !GOBJECT_COMPILATION */
+#    endif /* !GOBJECT_STATIC_COMPILATION */
+#    ifndef GOBJECT_FUNC
+#      define GOBJECT_FUNC
+#    endif /* !GOBJECT_FUNC */
+#  endif /* !G_PLATFORM_WIN32 */
+#endif /* GOBJECT_FUNC */
+
 /* Basic Type Macros
  */
 #define G_TYPE_FUNDAMENTAL(type)	(g_type_fundamental (type))
@@ -164,44 +221,44 @@
 
 
 /* --- prototypes --- */
-void                  g_type_init                    (void);
-void                  g_type_init_with_debug_flags   (GTypeDebugFlags  debug_flags);
-G_CONST_RETURN gchar* g_type_name                    (GType            type);
-GQuark                g_type_qname                   (GType            type);
-GType                 g_type_from_name               (const gchar     *name);
-GType                 g_type_parent                  (GType            type);
-guint                 g_type_depth                   (GType            type);
-GType                 g_type_next_base               (GType            leaf_type,
-						      GType            root_type);
-gboolean              g_type_is_a                    (GType            type,
-						      GType            is_a_type);
-gpointer              g_type_class_ref               (GType            type);
-gpointer              g_type_class_peek              (GType            type);
-gpointer              g_type_class_peek_static       (GType            type);
-void                  g_type_class_unref             (gpointer         g_class);
-gpointer              g_type_class_peek_parent       (gpointer         g_class);
-gpointer              g_type_interface_peek          (gpointer         instance_class,
-						      GType            iface_type);
-gpointer              g_type_interface_peek_parent   (gpointer         g_iface);
+GOBJECT_FUNC void                  g_type_init                    (void);;
+GOBJECT_FUNC void                  g_type_init_with_debug_flags   (GTypeDebugFlags  debug_flags);;
+GOBJECT_FUNC G_CONST_RETURN gchar* g_type_name                    (GType            type);;
+GOBJECT_FUNC GQuark                g_type_qname                   (GType            type);;
+GOBJECT_FUNC GType                 g_type_from_name               (const gchar     *name);;
+GOBJECT_FUNC GType                 g_type_parent                  (GType            type);;
+GOBJECT_FUNC guint                 g_type_depth                   (GType            type);;
+GOBJECT_FUNC GType                 g_type_next_base               (GType            leaf_type,
+						      GType            root_type);;
+GOBJECT_FUNC gboolean              g_type_is_a                    (GType            type,
+						      GType            is_a_type);;
+GOBJECT_FUNC gpointer              g_type_class_ref               (GType            type);;
+GOBJECT_FUNC gpointer              g_type_class_peek              (GType            type);;
+GOBJECT_FUNC gpointer              g_type_class_peek_static       (GType            type);;
+GOBJECT_FUNC void                  g_type_class_unref             (gpointer         g_class);;
+GOBJECT_FUNC gpointer              g_type_class_peek_parent       (gpointer         g_class);;
+GOBJECT_FUNC gpointer              g_type_interface_peek          (gpointer         instance_class,
+						      GType            iface_type);;
+GOBJECT_FUNC gpointer              g_type_interface_peek_parent   (gpointer         g_iface);;
 
-gpointer              g_type_default_interface_ref   (GType            g_type);
-gpointer              g_type_default_interface_peek  (GType            g_type);
-void                  g_type_default_interface_unref (gpointer         g_iface);
+GOBJECT_FUNC gpointer              g_type_default_interface_ref   (GType            g_type);;
+GOBJECT_FUNC gpointer              g_type_default_interface_peek  (GType            g_type);;
+GOBJECT_FUNC void                  g_type_default_interface_unref (gpointer         g_iface);;
 
 /* g_free() the returned arrays */
-GType*                g_type_children                (GType            type,
-						      guint           *n_children);
-GType*                g_type_interfaces              (GType            type,
-						      guint           *n_interfaces);
+GOBJECT_FUNC GType*                g_type_children                (GType            type,
+						      guint           *n_children);;
+GOBJECT_FUNC GType*                g_type_interfaces              (GType            type,
+						      guint           *n_interfaces);;
 
 /* per-type _static_ data */
-void                  g_type_set_qdata               (GType            type,
+GOBJECT_FUNC void                  g_type_set_qdata               (GType            type,
 						      GQuark           quark,
-						      gpointer         data);
-gpointer              g_type_get_qdata               (GType            type,
-						      GQuark           quark);
-void		      g_type_query		     (GType	       type,
-						      GTypeQuery      *query);
+						      gpointer         data);;
+GOBJECT_FUNC gpointer              g_type_get_qdata               (GType            type,
+						      GQuark           quark);;
+GOBJECT_FUNC void		      g_type_query		     (GType	       type,
+						      GTypeQuery      *query);;
 
 
 /* --- type registration --- */
@@ -283,33 +340,33 @@
 				  GTypeCValue  *collect_values,
 				  guint		collect_flags);
 };
-GType g_type_register_static		(GType			     parent_type,
+GOBJECT_FUNC GType g_type_register_static		(GType			     parent_type,
 					 const gchar		    *type_name,
 					 const GTypeInfo	    *info,
-					 GTypeFlags		     flags);
-GType g_type_register_dynamic		(GType			     parent_type,
+					 GTypeFlags		     flags);;
+GOBJECT_FUNC GType g_type_register_dynamic		(GType			     parent_type,
 					 const gchar		    *type_name,
 					 GTypePlugin		    *plugin,
-					 GTypeFlags		     flags);
-GType g_type_register_fundamental	(GType			     type_id,
+					 GTypeFlags		     flags);;
+GOBJECT_FUNC GType g_type_register_fundamental	(GType			     type_id,
 					 const gchar		    *type_name,
 					 const GTypeInfo	    *info,
 					 const GTypeFundamentalInfo *finfo,
-					 GTypeFlags		     flags);
-void  g_type_add_interface_static	(GType			     instance_type,
+					 GTypeFlags		     flags);;
+GOBJECT_FUNC void  g_type_add_interface_static	(GType			     instance_type,
 					 GType			     interface_type,
-					 const GInterfaceInfo	    *info);
-void  g_type_add_interface_dynamic	(GType			     instance_type,
+					 const GInterfaceInfo	    *info);;
+GOBJECT_FUNC void  g_type_add_interface_dynamic	(GType			     instance_type,
 					 GType			     interface_type,
-					 GTypePlugin		    *plugin);
-void  g_type_interface_add_prerequisite (GType			     interface_type,
-					 GType			     prerequisite_type);
-GType*g_type_interface_prerequisites    (GType                       interface_type,
+					 GTypePlugin		    *plugin);;
+GOBJECT_FUNC void  g_type_interface_add_prerequisite (GType			     interface_type,
+					 GType			     prerequisite_type);;
+GOBJECT_FUNC GType*g_type_interface_prerequisites    (GType                       interface_type,
 					 guint                      *n_prerequisites);
-void     g_type_class_add_private       (gpointer                    g_class,
-                                         gsize                       private_size);
-gpointer g_type_instance_get_private    (GTypeInstance              *instance,
-                                         GType                       private_type);
+GOBJECT_FUNC void     g_type_class_add_private       (gpointer                    g_class,
+                                         gsize                       private_size);;
+GOBJECT_FUNC gpointer g_type_instance_get_private    (GTypeInstance              *instance,
+                                         GType                       private_type);;
 
 
 /* --- GType boilerplate --- */
@@ -382,49 +439,49 @@
 
 
 /* --- protected (for fundamental type implementations) --- */
-GTypePlugin*	 g_type_get_plugin		(GType		     type);
-GTypePlugin*	 g_type_interface_get_plugin	(GType		     instance_type,
-						 GType               interface_type);
-GType		 g_type_fundamental_next	(void);
-GType		 g_type_fundamental		(GType		     type_id);
-GTypeInstance*   g_type_create_instance         (GType               type);
-void             g_type_free_instance           (GTypeInstance      *instance);
+GOBJECT_FUNC GTypePlugin*	 g_type_get_plugin		(GType		     type);;
+GOBJECT_FUNC GTypePlugin*	 g_type_interface_get_plugin	(GType		     instance_type,
+						 GType               interface_type);;
+GOBJECT_FUNC GType		 g_type_fundamental_next	(void);;
+GOBJECT_FUNC GType		 g_type_fundamental		(GType		     type_id);;
+GOBJECT_FUNC GTypeInstance*   g_type_create_instance         (GType               type);;
+GOBJECT_FUNC void             g_type_free_instance           (GTypeInstance      *instance);;
 
-void		 g_type_add_class_cache_func    (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-void		 g_type_remove_class_cache_func (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-void             g_type_class_unref_uncached    (gpointer            g_class);
+GOBJECT_FUNC void		 g_type_add_class_cache_func    (gpointer	     cache_data,
+						 GTypeClassCacheFunc cache_func);;
+GOBJECT_FUNC void		 g_type_remove_class_cache_func (gpointer	     cache_data,
+						 GTypeClassCacheFunc cache_func);;
+GOBJECT_FUNC void             g_type_class_unref_uncached    (gpointer            g_class);;
 
-void             g_type_add_interface_check     (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc check_func);
-void             g_type_remove_interface_check  (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc chec_func);
+GOBJECT_FUNC void             g_type_add_interface_check     (gpointer	         check_data,
+						 GTypeInterfaceCheckFunc check_func);;
+GOBJECT_FUNC void             g_type_remove_interface_check  (gpointer	         check_data,
+						 GTypeInterfaceCheckFunc chec_func);;
 
-GTypeValueTable* g_type_value_table_peek        (GType		     type);
+GOBJECT_FUNC GTypeValueTable* g_type_value_table_peek        (GType		     type);;
 
 
 /*< private >*/
-gboolean	 g_type_check_instance          (GTypeInstance      *instance);
-GTypeInstance*   g_type_check_instance_cast     (GTypeInstance      *instance,
-						 GType               iface_type);
-gboolean         g_type_check_instance_is_a	(GTypeInstance      *instance,
-						 GType               iface_type);
-GTypeClass*      g_type_check_class_cast        (GTypeClass         *g_class,
-						 GType               is_a_type);
-gboolean         g_type_check_class_is_a        (GTypeClass         *g_class,
-						 GType               is_a_type);
-gboolean	 g_type_check_is_value_type     (GType		     type);
-gboolean	 g_type_check_value             (GValue		    *value);
-gboolean	 g_type_check_value_holds	(GValue		    *value,
-						 GType		     type);
-gboolean         g_type_test_flags              (GType               type,
-						 guint               flags);
+GOBJECT_FUNC gboolean	 g_type_check_instance          (GTypeInstance      *instance);;
+GOBJECT_FUNC GTypeInstance*   g_type_check_instance_cast     (GTypeInstance      *instance,
+						 GType               iface_type);;
+GOBJECT_FUNC gboolean         g_type_check_instance_is_a	(GTypeInstance      *instance,
+						 GType               iface_type);;
+GOBJECT_FUNC GTypeClass*      g_type_check_class_cast        (GTypeClass         *g_class,
+						 GType               is_a_type);;
+GOBJECT_FUNC gboolean         g_type_check_class_is_a        (GTypeClass         *g_class,
+						 GType               is_a_type);;
+GOBJECT_FUNC gboolean	 g_type_check_is_value_type     (GType		     type);;
+GOBJECT_FUNC gboolean	 g_type_check_value             (GValue		    *value);;
+GOBJECT_FUNC gboolean	 g_type_check_value_holds	(GValue		    *value,
+						 GType		     type);;
+GOBJECT_FUNC gboolean         g_type_test_flags              (GType               type,
+						 guint               flags);;
 
 
 /* --- debugging functions --- */
-G_CONST_RETURN gchar* g_type_name_from_instance	(GTypeInstance	*instance);
-G_CONST_RETURN gchar* g_type_name_from_class	(GTypeClass	*g_class);
+GOBJECT_FUNC G_CONST_RETURN gchar* g_type_name_from_instance	(GTypeInstance	*instance);;
+GOBJECT_FUNC G_CONST_RETURN gchar* g_type_name_from_class	(GTypeClass	*g_class);;
 
 
 /* --- implementation bits --- */
--- glib-2.4.6/gobject/gtypemodule.h~visibility.patch
+++ glib-2.4.6/gobject/gtypemodule.h
@@ -65,20 +65,20 @@
   void (*reserved4) (void);
 };
 
-GType    g_type_module_get_type      (void);
-gboolean g_type_module_use           (GTypeModule     *module);
-void     g_type_module_unuse         (GTypeModule     *module);
-void     g_type_module_set_name      (GTypeModule     *module,
-				      const gchar     *name);
-GType    g_type_module_register_type (GTypeModule     *module,
+GOBJECT_FUNC GType    g_type_module_get_type      (void);;
+GOBJECT_FUNC gboolean g_type_module_use           (GTypeModule     *module);;
+GOBJECT_FUNC void     g_type_module_unuse         (GTypeModule     *module);;
+GOBJECT_FUNC void     g_type_module_set_name      (GTypeModule     *module,
+				      const gchar     *name);;
+GOBJECT_FUNC GType    g_type_module_register_type (GTypeModule     *module,
 				      GType            parent_type,
 				      const gchar     *type_name,
 				      const GTypeInfo *type_info,
-				      GTypeFlags       flags);
-void     g_type_module_add_interface (GTypeModule           *module,
+				      GTypeFlags       flags);;
+GOBJECT_FUNC void     g_type_module_add_interface (GTypeModule           *module,
 				      GType                  instance_type,
 				      GType                  interface_type,
-				      const GInterfaceInfo  *interface_info);
+				      const GInterfaceInfo  *interface_info);;
 
 G_END_DECLS
 
--- glib-2.4.6/gobject/gtypeplugin.h~visibility.patch
+++ glib-2.4.6/gobject/gtypeplugin.h
@@ -62,17 +62,17 @@
 
 
 /* --- prototypes --- */
-GType	g_type_plugin_get_type			(void)	G_GNUC_CONST;
-void	g_type_plugin_use			(GTypePlugin	 *plugin);
-void	g_type_plugin_unuse			(GTypePlugin	 *plugin);
-void	g_type_plugin_complete_type_info	(GTypePlugin     *plugin,
+GOBJECT_FUNC GType	g_type_plugin_get_type			(void)	G_GNUC_CONST;
+GOBJECT_FUNC void	g_type_plugin_use			(GTypePlugin	 *plugin);;
+GOBJECT_FUNC void	g_type_plugin_unuse			(GTypePlugin	 *plugin);;
+GOBJECT_FUNC void	g_type_plugin_complete_type_info	(GTypePlugin     *plugin,
 						 GType            g_type,
 						 GTypeInfo       *info,
-						 GTypeValueTable *value_table);
-void	g_type_plugin_complete_interface_info	(GTypePlugin     *plugin,
+						 GTypeValueTable *value_table);;
+GOBJECT_FUNC void	g_type_plugin_complete_interface_info	(GTypePlugin     *plugin,
 						 GType            instance_type,
 						 GType            interface_type,
-						 GInterfaceInfo  *info);
+						 GInterfaceInfo  *info);;
 
 G_END_DECLS
 
--- glib-2.4.6/gobject/gvaluearray.h~visibility.patch
+++ glib-2.4.6/gobject/gvaluearray.h
@@ -46,25 +46,25 @@
 
 
 /* --- prototypes --- */
-GValue*		g_value_array_get_nth	     (GValueArray	*value_array,
-					      guint		 index_);
-GValueArray*	g_value_array_new	     (guint		 n_prealloced);
-void		g_value_array_free	     (GValueArray	*value_array);
-GValueArray*	g_value_array_copy	     (const GValueArray *value_array);
-GValueArray*	g_value_array_prepend	     (GValueArray	*value_array,
-					      const GValue	*value);
-GValueArray*	g_value_array_append	     (GValueArray	*value_array,
-					      const GValue	*value);
-GValueArray*	g_value_array_insert	     (GValueArray	*value_array,
+GOBJECT_FUNC GValue*		g_value_array_get_nth	     (GValueArray	*value_array,
+					      guint		 index_);;
+GOBJECT_FUNC GValueArray*	g_value_array_new	     (guint		 n_prealloced);;
+GOBJECT_FUNC void		g_value_array_free	     (GValueArray	*value_array);;
+GOBJECT_FUNC GValueArray*	g_value_array_copy	     (const GValueArray *value_array);;
+GOBJECT_FUNC GValueArray*	g_value_array_prepend	     (GValueArray	*value_array,
+					      const GValue	*value);;
+GOBJECT_FUNC GValueArray*	g_value_array_append	     (GValueArray	*value_array,
+					      const GValue	*value);;
+GOBJECT_FUNC GValueArray*	g_value_array_insert	     (GValueArray	*value_array,
 					      guint		 index_,
-					      const GValue	*value);
-GValueArray*	g_value_array_remove	     (GValueArray	*value_array,
-					      guint		 index_);
-GValueArray*	g_value_array_sort	     (GValueArray	*value_array,
-					      GCompareFunc	 compare_func);
-GValueArray*	g_value_array_sort_with_data (GValueArray	*value_array,
+					      const GValue	*value);;
+GOBJECT_FUNC GValueArray*	g_value_array_remove	     (GValueArray	*value_array,
+					      guint		 index_);;
+GOBJECT_FUNC GValueArray*	g_value_array_sort	     (GValueArray	*value_array,
+					      GCompareFunc	 compare_func);;
+GOBJECT_FUNC GValueArray*	g_value_array_sort_with_data (GValueArray	*value_array,
 					      GCompareDataFunc	 compare_func,
-					      gpointer		 user_data);
+					      gpointer		 user_data);;
 
 
 
--- glib-2.4.6/gobject/gvalue.h~visibility.patch
+++ glib-2.4.6/gobject/gvalue.h
@@ -61,31 +61,31 @@
 
 
 /* --- prototypes --- */
-GValue*         g_value_init	   	(GValue       *value,
-					 GType         g_type);
-void            g_value_copy    	(const GValue *src_value,
-					 GValue       *dest_value);
-GValue*         g_value_reset   	(GValue       *value);
-void            g_value_unset   	(GValue       *value);
-void		g_value_set_instance	(GValue	      *value,
-					 gpointer      instance);
+GOBJECT_FUNC GValue*         g_value_init	   	(GValue       *value,
+					 GType         g_type);;
+GOBJECT_FUNC void            g_value_copy    	(const GValue *src_value,
+					 GValue       *dest_value);;
+GOBJECT_FUNC GValue*         g_value_reset   	(GValue       *value);;
+GOBJECT_FUNC void            g_value_unset   	(GValue       *value);;
+GOBJECT_FUNC void		g_value_set_instance	(GValue	      *value,
+					 gpointer      instance);;
 
 
 /* --- private --- */
-gboolean	g_value_fits_pointer	(const GValue *value);
-gpointer	g_value_peek_pointer	(const GValue *value);
+GOBJECT_FUNC gboolean	g_value_fits_pointer	(const GValue *value);;
+GOBJECT_FUNC gpointer	g_value_peek_pointer	(const GValue *value);;
 
 
 /* --- implementation details --- */
-gboolean g_value_type_compatible	(GType		 src_type,
-					 GType		 dest_type);
-gboolean g_value_type_transformable	(GType           src_type,
-					 GType           dest_type);
-gboolean g_value_transform		(const GValue   *src_value,
-					 GValue         *dest_value);
-void	g_value_register_transform_func	(GType		 src_type,
+GOBJECT_FUNC gboolean g_value_type_compatible	(GType		 src_type,
+					 GType		 dest_type);;
+GOBJECT_FUNC gboolean g_value_type_transformable	(GType           src_type,
+					 GType           dest_type);;
+GOBJECT_FUNC gboolean g_value_transform		(const GValue   *src_value,
+					 GValue         *dest_value);;
+GOBJECT_FUNC void	g_value_register_transform_func	(GType		 src_type,
 					 GType		 dest_type,
-					 GValueTransform transform_func);
+					 GValueTransform transform_func);;
 #define G_VALUE_NOCOPY_CONTENTS		(1 << 27)
 
 
--- glib-2.4.6/gobject/gvaluetypes.h~visibility.patch
+++ glib-2.4.6/gobject/gvaluetypes.h
@@ -46,62 +46,62 @@
 
 
 /* --- prototypes --- */
-void		      g_value_set_char		(GValue	      *value,
-						 gchar	       v_char);
-gchar		      g_value_get_char		(const GValue *value);
-void		      g_value_set_uchar		(GValue	      *value,
-						 guchar	       v_uchar);
-guchar		      g_value_get_uchar		(const GValue *value);
-void		      g_value_set_boolean	(GValue	      *value,
-						 gboolean      v_boolean);
-gboolean	      g_value_get_boolean	(const GValue *value);
-void		      g_value_set_int		(GValue	      *value,
-						 gint	       v_int);
-gint		      g_value_get_int		(const GValue *value);
-void		      g_value_set_uint		(GValue	      *value,
-						 guint	       v_uint);
-guint		      g_value_get_uint		(const GValue *value);
-void		      g_value_set_long		(GValue	      *value,
-						 glong	       v_long);
-glong		      g_value_get_long		(const GValue *value);
-void		      g_value_set_ulong		(GValue	      *value,
-						 gulong	       v_ulong);
-gulong		      g_value_get_ulong		(const GValue *value);
-void		      g_value_set_int64		(GValue	      *value,
-						 gint64	       v_int64);
-gint64		      g_value_get_int64		(const GValue *value);
-void		      g_value_set_uint64	(GValue	      *value,
-						 guint64      v_uint64);
-guint64		      g_value_get_uint64	(const GValue *value);
-void		      g_value_set_float		(GValue	      *value,
-						 gfloat	       v_float);
-gfloat		      g_value_get_float		(const GValue *value);
-void		      g_value_set_double	(GValue	      *value,
-						 gdouble       v_double);
-gdouble		      g_value_get_double	(const GValue *value);
-void		      g_value_set_string	(GValue	      *value,
-						 const gchar  *v_string);
-void		      g_value_set_static_string (GValue	      *value,
-						 const gchar  *v_string);
-G_CONST_RETURN gchar* g_value_get_string	(const GValue *value);
-gchar*		      g_value_dup_string	(const GValue *value);
-void		      g_value_set_pointer	(GValue	      *value,
-						 gpointer      v_pointer);
-gpointer	      g_value_get_pointer	(const GValue *value);
+GOBJECT_FUNC void		      g_value_set_char		(GValue	      *value,
+						 gchar	       v_char);;
+GOBJECT_FUNC gchar		      g_value_get_char		(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_uchar		(GValue	      *value,
+						 guchar	       v_uchar);;
+GOBJECT_FUNC guchar		      g_value_get_uchar		(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_boolean	(GValue	      *value,
+						 gboolean      v_boolean);;
+GOBJECT_FUNC gboolean	      g_value_get_boolean	(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_int		(GValue	      *value,
+						 gint	       v_int);;
+GOBJECT_FUNC gint		      g_value_get_int		(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_uint		(GValue	      *value,
+						 guint	       v_uint);;
+GOBJECT_FUNC guint		      g_value_get_uint		(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_long		(GValue	      *value,
+						 glong	       v_long);;
+GOBJECT_FUNC glong		      g_value_get_long		(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_ulong		(GValue	      *value,
+						 gulong	       v_ulong);;
+GOBJECT_FUNC gulong		      g_value_get_ulong		(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_int64		(GValue	      *value,
+						 gint64	       v_int64);;
+GOBJECT_FUNC gint64		      g_value_get_int64		(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_uint64	(GValue	      *value,
+						 guint64      v_uint64);;
+GOBJECT_FUNC guint64		      g_value_get_uint64	(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_float		(GValue	      *value,
+						 gfloat	       v_float);;
+GOBJECT_FUNC gfloat		      g_value_get_float		(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_double	(GValue	      *value,
+						 gdouble       v_double);;
+GOBJECT_FUNC gdouble		      g_value_get_double	(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_string	(GValue	      *value,
+						 const gchar  *v_string);;
+GOBJECT_FUNC void		      g_value_set_static_string (GValue	      *value,
+						 const gchar  *v_string);;
+GOBJECT_FUNC G_CONST_RETURN gchar* g_value_get_string	(const GValue *value);;
+GOBJECT_FUNC gchar*		      g_value_dup_string	(const GValue *value);;
+GOBJECT_FUNC void		      g_value_set_pointer	(GValue	      *value,
+						 gpointer      v_pointer);;
+GOBJECT_FUNC gpointer	      g_value_get_pointer	(const GValue *value);;
 
 
 /* Convenience for registering new pointer types */
-GType                 g_pointer_type_register_static (const gchar *name);
+GOBJECT_FUNC GType                 g_pointer_type_register_static (const gchar *name);;
 
 /* debugging aid, describe value contents as string */
-gchar*                g_strdup_value_contents   (const GValue *value);
+GOBJECT_FUNC gchar*                g_strdup_value_contents   (const GValue *value);;
 
 
-void g_value_take_string		        (GValue		   *value,
-						 gchar		   *v_string);
+GOBJECT_FUNC void g_value_take_string		        (GValue		   *value,
+						 gchar		   *v_string);;
 #ifndef G_DISABLE_DEPRECATED
-void g_value_set_string_take_ownership		(GValue		   *value,
-						 gchar		   *v_string);
+GOBJECT_FUNC void g_value_set_string_take_ownership		(GValue		   *value,
+						 gchar		   *v_string);;
 #endif
 
 
--- glib-2.4.6/gthread/gthread.def~visibility.patch
+++ glib-2.4.6/gthread/gthread.def
@@ -1,3 +1,2 @@
-EXPORTS
 	g_thread_init
 	g_thread_init_with_errorcheck_mutexes
--- glib-2.4.6/gthread/Makefile.am~visibility.patch
+++ glib-2.4.6/gthread/Makefile.am
@@ -2,7 +2,8 @@
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gthread \
 	-DG_LOG_DOMAIN=\"GThread\" @GTHREAD_COMPILE_IMPL_DEFINES@ \
-	@GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED
+	@GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED \
+	-DGLIB_COMPILATION
 
 EXTRA_DIST =				\
 		makefile.msc.in		\