[gtk+] Drop the extra resources/ subdirectory



commit e4335c62a1be4c76614a6db5223a1708879ea5ca
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Nov 30 14:50:05 2014 -0500

    Drop the extra resources/ subdirectory
    
    This subdirectory gets in the way when integrating the inspector
    build more fully with GTK+, and does not really add anything.
    Just move everything one level up.

 gtk/Makefile.am                                    |  132 ++++++++++----------
 gtk/{resources => }/cursor/dnd-ask.png             |  Bin 201 -> 201 bytes
 gtk/{resources => }/cursor/dnd-copy.png            |  Bin 183 -> 183 bytes
 gtk/{resources => }/cursor/dnd-link.png            |  Bin 216 -> 216 bytes
 gtk/{resources => }/cursor/dnd-move.png            |  Bin 197 -> 197 bytes
 gtk/{resources => }/cursor/dnd-none.png            |  Bin 144 -> 144 bytes
 .../icons/16x16/actions/gtk-caps-lock-warning.png  |  Bin 275 -> 275 bytes
 .../icons/16x16/actions/gtk-color-picker.png       |  Bin 606 -> 606 bytes
 .../icons/16x16/actions/gtk-connect.png            |  Bin 692 -> 692 bytes
 .../icons/16x16/actions/gtk-convert.png            |  Bin 677 -> 677 bytes
 .../icons/16x16/actions/gtk-disconnect.png         |  Bin 715 -> 715 bytes
 .../icons/16x16/actions/gtk-edit.png               |  Bin 755 -> 755 bytes
 .../icons/16x16/actions/gtk-index.png              |  Bin 753 -> 753 bytes
 .../16x16/actions/gtk-orientation-landscape.png    |  Bin 756 -> 756 bytes
 .../16x16/actions/gtk-orientation-portrait.png     |  Bin 543 -> 543 bytes
 .../actions/gtk-orientation-reverse-landscape.png  |  Bin 751 -> 751 bytes
 .../actions/gtk-orientation-reverse-portrait.png   |  Bin 557 -> 557 bytes
 .../icons/16x16/actions/gtk-page-setup.png         |  Bin 622 -> 622 bytes
 .../icons/16x16/actions/gtk-preferences.png        |  Bin 1014 -> 1014 bytes
 .../icons/16x16/actions/gtk-select-color.png       |  Bin 735 -> 735 bytes
 .../icons/16x16/actions/gtk-select-font.png        |  Bin 706 -> 706 bytes
 .../icons/16x16/actions/gtk-undelete-rtl.png       |  Bin 952 -> 952 bytes
 .../icons/16x16/actions/gtk-undelete.png           |  Bin 962 -> 962 bytes
 .../icons/16x16/status/image-missing.png           |  Bin 576 -> 576 bytes
 .../icons/22x22/actions/gtk-apply.png              |  Bin 1002 -> 1002 bytes
 .../icons/22x22/actions/gtk-cancel.png             |  Bin 1067 -> 1067 bytes
 gtk/{resources => }/icons/22x22/actions/gtk-no.png |  Bin 952 -> 952 bytes
 gtk/{resources => }/icons/22x22/actions/gtk-ok.png |  Bin 963 -> 963 bytes
 .../icons/22x22/actions/gtk-yes.png                |  Bin 1044 -> 1044 bytes
 .../icons/24x24/actions/gtk-caps-lock-warning.png  |  Bin 360 -> 360 bytes
 .../icons/24x24/actions/gtk-color-picker.png       |  Bin 891 -> 891 bytes
 .../icons/24x24/actions/gtk-connect.png            |  Bin 946 -> 946 bytes
 .../icons/24x24/actions/gtk-convert.png            |  Bin 1413 -> 1413 bytes
 .../icons/24x24/actions/gtk-disconnect.png         |  Bin 852 -> 852 bytes
 .../icons/24x24/actions/gtk-edit.png               |  Bin 1120 -> 1120 bytes
 .../icons/24x24/actions/gtk-index.png              |  Bin 960 -> 960 bytes
 .../24x24/actions/gtk-orientation-landscape.png    |  Bin 1097 -> 1097 bytes
 .../24x24/actions/gtk-orientation-portrait.png     |  Bin 931 -> 931 bytes
 .../actions/gtk-orientation-reverse-landscape.png  |  Bin 1059 -> 1059 bytes
 .../actions/gtk-orientation-reverse-portrait.png   |  Bin 940 -> 940 bytes
 .../icons/24x24/actions/gtk-page-setup.png         |  Bin 1081 -> 1081 bytes
 .../icons/24x24/actions/gtk-preferences.png        |  Bin 1691 -> 1691 bytes
 .../icons/24x24/actions/gtk-select-color.png       |  Bin 993 -> 993 bytes
 .../icons/24x24/actions/gtk-select-font.png        |  Bin 1109 -> 1109 bytes
 .../icons/24x24/actions/gtk-undelete-rtl.png       |  Bin 1722 -> 1722 bytes
 .../icons/24x24/actions/gtk-undelete.png           |  Bin 1692 -> 1692 bytes
 .../icons/24x24/status/image-missing.png           |  Bin 877 -> 877 bytes
 .../icons/32x32/actions/gtk-dnd-multiple.png       |  Bin 1215 -> 1215 bytes
 .../icons/32x32/actions/gtk-dnd.png                |  Bin 1349 -> 1349 bytes
 .../icons/32x32/status/image-missing.png           |  Bin 1039 -> 1039 bytes
 .../icons/48x48/status/image-missing.png           |  Bin 1728 -> 1728 bytes
 gtk/{resources => }/theme/Adwaita/Gemfile          |    0
 gtk/{resources => }/theme/Adwaita/README           |    0
 .../theme/Adwaita/_colors-public.scss              |    0
 gtk/{resources => }/theme/Adwaita/_colors.scss     |    0
 gtk/{resources => }/theme/Adwaita/_common.scss     |    0
 gtk/{resources => }/theme/Adwaita/_drawing.scss    |    0
 gtk/{resources => }/theme/Adwaita/assets.svg       |    0
 gtk/{resources => }/theme/Adwaita/assets.txt       |    0
 .../assets/checkbox-active-selectionmode.png       |  Bin 870 -> 870 bytes
 .../assets/checkbox-active-selectionmode 2 png     |  Bin 1724 -> 1724 bytes
 .../assets/checkbox-backdrop-selectionmode.png     |  Bin 801 -> 801 bytes
 .../assets/checkbox-backdrop-selectionmode 2 png   |  Bin 1579 -> 1579 bytes
 .../assets/checkbox-checked-active-dark.png        |  Bin 636 -> 636 bytes
 .../assets/checkbox-checked-active-dark 2 png      |  Bin 1240 -> 1240 bytes
 .../checkbox-checked-active-selectionmode.png      |  Bin 1289 -> 1289 bytes
 .../checkbox-checked-active-selectionmode 2 png    |  Bin 2575 -> 2575 bytes
 .../Adwaita/assets/checkbox-checked-active.png     |  Bin 658 -> 658 bytes
 .../Adwaita/assets/checkbox-checked-active 2 png   |  Bin 1332 -> 1332 bytes
 .../assets/checkbox-checked-backdrop-dark.png      |  Bin 592 -> 592 bytes
 .../assets/checkbox-checked-backdrop-dark 2 png    |  Bin 1033 -> 1033 bytes
 .../checkbox-checked-backdrop-insensitive-dark.png |  Bin 488 -> 488 bytes
    heckbox-checked-backdrop-insensitive-dark 2 png |  Bin 827 -> 827 bytes
 .../checkbox-checked-backdrop-insensitive.png      |  Bin 534 -> 534 bytes
 .../checkbox-checked-backdrop-insensitive 2 png    |  Bin 939 -> 939 bytes
 .../checkbox-checked-backdrop-selectionmode.png    |  Bin 1281 -> 1281 bytes
 .../checkbox-checked-backdrop-selectionmode 2 png  |  Bin 2423 -> 2423 bytes
 .../Adwaita/assets/checkbox-checked-backdrop.png   |  Bin 605 -> 605 bytes
 .../Adwaita/assets/checkbox-checked-backdrop 2 png |  Bin 1068 -> 1068 bytes
 .../theme/Adwaita/assets/checkbox-checked-dark.png |  Bin 692 -> 692 bytes
 .../Adwaita/assets/checkbox-checked-dark 2 png     |  Bin 1325 -> 1325 bytes
 .../Adwaita/assets/checkbox-checked-hover-dark.png |  Bin 697 -> 697 bytes
 .../assets/checkbox-checked-hover-dark 2 png       |  Bin 1365 -> 1365 bytes
 .../checkbox-checked-hover-selectionmode.png       |  Bin 1346 -> 1346 bytes
 .../checkbox-checked-hover-selectionmode 2 png     |  Bin 2693 -> 2693 bytes
 .../Adwaita/assets/checkbox-checked-hover.png      |  Bin 660 -> 660 bytes
 .../Adwaita/assets/checkbox-checked-hover 2 png    |  Bin 1276 -> 1276 bytes
 .../assets/checkbox-checked-insensitive-dark.png   |  Bin 552 -> 552 bytes
 .../assets/checkbox-checked-insensitive-dark 2 png |  Bin 971 -> 971 bytes
 .../assets/checkbox-checked-insensitive.png        |  Bin 582 -> 582 bytes
 .../assets/checkbox-checked-insensitive 2 png      |  Bin 1037 -> 1037 bytes
 .../assets/checkbox-checked-selectionmode.png      |  Bin 1383 -> 1383 bytes
 .../assets/checkbox-checked-selectionmode 2 png    |  Bin 2755 -> 2755 bytes
 .../theme/Adwaita/assets/checkbox-checked.png      |  Bin 663 -> 663 bytes
 .../theme/Adwaita/assets/checkbox-checked 2 png    |  Bin 1331 -> 1331 bytes
 .../assets/checkbox-hover-selectionmode.png        |  Bin 902 -> 902 bytes
 .../assets/checkbox-hover-selectionmode 2 png      |  Bin 1809 -> 1809 bytes
 .../Adwaita/assets/checkbox-mixed-active-dark.png  |  Bin 470 -> 470 bytes
 .../assets/checkbox-mixed-active-dark 2 png        |  Bin 852 -> 852 bytes
 .../theme/Adwaita/assets/checkbox-mixed-active.png |  Bin 520 -> 520 bytes
 .../Adwaita/assets/checkbox-mixed-active 2 png     |  Bin 992 -> 992 bytes
 .../assets/checkbox-mixed-backdrop-dark.png        |  Bin 439 -> 439 bytes
 .../assets/checkbox-mixed-backdrop-dark 2 png      |  Bin 727 -> 727 bytes
 .../checkbox-mixed-backdrop-insensitive-dark.png   |  Bin 405 -> 405 bytes
 .../checkbox-mixed-backdrop-insensitive-dark 2 png |  Bin 677 -> 677 bytes
 .../assets/checkbox-mixed-backdrop-insensitive.png |  Bin 444 -> 444 bytes
 .../checkbox-mixed-backdrop-insensitive 2 png      |  Bin 759 -> 759 bytes
 .../Adwaita/assets/checkbox-mixed-backdrop.png     |  Bin 460 -> 460 bytes
 .../Adwaita/assets/checkbox-mixed-backdrop 2 png   |  Bin 786 -> 786 bytes
 .../theme/Adwaita/assets/checkbox-mixed-dark.png   |  Bin 542 -> 542 bytes
 .../theme/Adwaita/assets/checkbox-mixed-dark 2 png |  Bin 1014 -> 1014 bytes
 .../Adwaita/assets/checkbox-mixed-hover-dark.png   |  Bin 568 -> 568 bytes
 .../Adwaita/assets/checkbox-mixed-hover-dark 2 png |  Bin 1033 -> 1033 bytes
 .../theme/Adwaita/assets/checkbox-mixed-hover.png  |  Bin 494 -> 494 bytes
 .../Adwaita/assets/checkbox-mixed-hover 2 png      |  Bin 920 -> 920 bytes
 .../assets/checkbox-mixed-insensitive-dark.png     |  Bin 427 -> 427 bytes
 .../assets/checkbox-mixed-insensitive-dark 2 png   |  Bin 706 -> 706 bytes
 .../Adwaita/assets/checkbox-mixed-insensitive.png  |  Bin 448 -> 448 bytes
 .../assets/checkbox-mixed-insensitive 2 png        |  Bin 783 -> 783 bytes
 .../theme/Adwaita/assets/checkbox-mixed.png        |  Bin 516 -> 516 bytes
 .../theme/Adwaita/assets/checkbox-mixed 2 png      |  Bin 997 -> 997 bytes
 .../Adwaita/assets/checkbox-selectionmode.png      |  Bin 929 -> 929 bytes
 .../Adwaita/assets/checkbox-selectionmode 2 png    |  Bin 1883 -> 1883 bytes
 .../assets/checkbox-unchecked-active-dark.png      |  Bin 356 -> 356 bytes
 .../assets/checkbox-unchecked-active-dark 2 png    |  Bin 633 -> 633 bytes
 .../Adwaita/assets/checkbox-unchecked-active.png   |  Bin 433 -> 433 bytes
 .../Adwaita/assets/checkbox-unchecked-active 2 png |  Bin 774 -> 774 bytes
 .../assets/checkbox-unchecked-backdrop-dark.png    |  Bin 358 -> 358 bytes
 .../assets/checkbox-unchecked-backdrop-dark 2 png  |  Bin 583 -> 583 bytes
 ...heckbox-unchecked-backdrop-insensitive-dark.png |  Bin 347 -> 347 bytes
    ckbox-unchecked-backdrop-insensitive-dark 2 png |  Bin 574 -> 574 bytes
 .../checkbox-unchecked-backdrop-insensitive.png    |  Bin 377 -> 377 bytes
 .../checkbox-unchecked-backdrop-insensitive 2 png  |  Bin 633 -> 633 bytes
 .../Adwaita/assets/checkbox-unchecked-backdrop.png |  Bin 384 -> 384 bytes
 .../assets/checkbox-unchecked-backdrop 2 png       |  Bin 622 -> 622 bytes
 .../Adwaita/assets/checkbox-unchecked-dark.png     |  Bin 426 -> 426 bytes
 .../Adwaita/assets/checkbox-unchecked-dark 2 png   |  Bin 778 -> 778 bytes
 .../assets/checkbox-unchecked-hover-dark.png       |  Bin 448 -> 448 bytes
 .../assets/checkbox-unchecked-hover-dark 2 png     |  Bin 808 -> 808 bytes
 .../Adwaita/assets/checkbox-unchecked-hover.png    |  Bin 406 -> 406 bytes
 .../Adwaita/assets/checkbox-unchecked-hover 2 png  |  Bin 750 -> 750 bytes
 .../assets/checkbox-unchecked-insensitive-dark.png |  Bin 347 -> 347 bytes
 .../checkbox-unchecked-insensitive-dark 2 png      |  Bin 574 -> 574 bytes
 .../assets/checkbox-unchecked-insensitive.png      |  Bin 377 -> 377 bytes
 .../assets/checkbox-unchecked-insensitive 2 png    |  Bin 633 -> 633 bytes
 .../theme/Adwaita/assets/checkbox-unchecked.png    |  Bin 418 -> 418 bytes
 .../theme/Adwaita/assets/checkbox-unchecked 2 png  |  Bin 798 -> 798 bytes
 .../Adwaita/assets/radio-checked-active-dark.png   |  Bin 638 -> 638 bytes
 .../Adwaita/assets/radio-checked-active-dark 2 png |  Bin 1207 -> 1207 bytes
 .../theme/Adwaita/assets/radio-checked-active.png  |  Bin 774 -> 774 bytes
 .../Adwaita/assets/radio-checked-active 2 png      |  Bin 1455 -> 1455 bytes
 .../Adwaita/assets/radio-checked-backdrop-dark.png |  Bin 589 -> 589 bytes
 .../assets/radio-checked-backdrop-dark 2 png       |  Bin 1054 -> 1054 bytes
 .../radio-checked-backdrop-insensitive-dark.png    |  Bin 539 -> 539 bytes
 .../radio-checked-backdrop-insensitive-dark 2 png  |  Bin 942 -> 942 bytes
 .../assets/radio-checked-backdrop-insensitive.png  |  Bin 614 -> 614 bytes
 .../radio-checked-backdrop-insensitive 2 png       |  Bin 1098 -> 1098 bytes
 .../Adwaita/assets/radio-checked-backdrop.png      |  Bin 646 -> 646 bytes
 .../Adwaita/assets/radio-checked-backdrop 2 png    |  Bin 1178 -> 1178 bytes
 .../theme/Adwaita/assets/radio-checked-dark.png    |  Bin 758 -> 758 bytes
 .../theme/Adwaita/assets/radio-checked-dark 2 png  |  Bin 1516 -> 1516 bytes
 .../Adwaita/assets/radio-checked-hover-dark.png    |  Bin 786 -> 786 bytes
 .../Adwaita/assets/radio-checked-hover-dark 2 png  |  Bin 1555 -> 1555 bytes
 .../theme/Adwaita/assets/radio-checked-hover.png   |  Bin 752 -> 752 bytes
 .../theme/Adwaita/assets/radio-checked-hover 2 png |  Bin 1475 -> 1475 bytes
 .../assets/radio-checked-insensitive-dark.png      |  Bin 564 -> 564 bytes
 .../assets/radio-checked-insensitive-dark 2 png    |  Bin 1029 -> 1029 bytes
 .../Adwaita/assets/radio-checked-insensitive.png   |  Bin 651 -> 651 bytes
 .../Adwaita/assets/radio-checked-insensitive 2 png |  Bin 1155 -> 1155 bytes
 .../theme/Adwaita/assets/radio-checked.png         |  Bin 782 -> 782 bytes
 .../theme/Adwaita/assets/radio-checked 2 png       |  Bin 1568 -> 1568 bytes
 .../Adwaita/assets/radio-mixed-active-dark.png     |  Bin 619 -> 619 bytes
 .../Adwaita/assets/radio-mixed-active-dark 2 png   |  Bin 1134 -> 1134 bytes
 .../theme/Adwaita/assets/radio-mixed-active.png    |  Bin 713 -> 713 bytes
 .../theme/Adwaita/assets/radio-mixed-active 2 png  |  Bin 1362 -> 1362 bytes
 .../Adwaita/assets/radio-mixed-backdrop-dark.png   |  Bin 545 -> 545 bytes
 .../Adwaita/assets/radio-mixed-backdrop-dark 2 png |  Bin 976 -> 976 bytes
 .../radio-mixed-backdrop-insensitive-dark.png      |  Bin 517 -> 517 bytes
 .../radio-mixed-backdrop-insensitive-dark 2 png    |  Bin 920 -> 920 bytes
 .../assets/radio-mixed-backdrop-insensitive.png    |  Bin 592 -> 592 bytes
 .../assets/radio-mixed-backdrop-insensitive 2 png  |  Bin 1040 -> 1040 bytes
 .../theme/Adwaita/assets/radio-mixed-backdrop.png  |  Bin 612 -> 612 bytes
 .../Adwaita/assets/radio-mixed-backdrop 2 png      |  Bin 1074 -> 1074 bytes
 .../theme/Adwaita/assets/radio-mixed-dark.png      |  Bin 720 -> 720 bytes
 .../theme/Adwaita/assets/radio-mixed-dark 2 png    |  Bin 1431 -> 1431 bytes
 .../Adwaita/assets/radio-mixed-hover-dark.png      |  Bin 734 -> 734 bytes
 .../Adwaita/assets/radio-mixed-hover-dark 2 png    |  Bin 1468 -> 1468 bytes
 .../theme/Adwaita/assets/radio-mixed-hover.png     |  Bin 698 -> 698 bytes
 .../theme/Adwaita/assets/radio-mixed-hover 2 png   |  Bin 1371 -> 1371 bytes
 .../assets/radio-mixed-insensitive-dark.png        |  Bin 539 -> 539 bytes
 .../assets/radio-mixed-insensitive-dark 2 png      |  Bin 964 -> 964 bytes
 .../Adwaita/assets/radio-mixed-insensitive.png     |  Bin 605 -> 605 bytes
 .../Adwaita/assets/radio-mixed-insensitive 2 png   |  Bin 1066 -> 1066 bytes
 .../theme/Adwaita/assets/radio-mixed.png           |  Bin 741 -> 741 bytes
 .../theme/Adwaita/assets/radio-mixed 2 png         |  Bin 1438 -> 1438 bytes
 .../Adwaita/assets/radio-unchecked-active-dark.png |  Bin 510 -> 510 bytes
 .../assets/radio-unchecked-active-dark 2 png       |  Bin 923 -> 923 bytes
 .../Adwaita/assets/radio-unchecked-active.png      |  Bin 631 -> 631 bytes
 .../Adwaita/assets/radio-unchecked-active 2 png    |  Bin 1165 -> 1165 bytes
 .../assets/radio-unchecked-backdrop-dark.png       |  Bin 513 -> 513 bytes
 .../assets/radio-unchecked-backdrop-dark 2 png     |  Bin 902 -> 902 bytes
 .../radio-unchecked-backdrop-insensitive-dark.png  |  Bin 513 -> 513 bytes
    radio-unchecked-backdrop-insensitive-dark 2 png |  Bin 902 -> 902 bytes
 .../radio-unchecked-backdrop-insensitive.png       |  Bin 536 -> 536 bytes
 .../radio-unchecked-backdrop-insensitive 2 png     |  Bin 924 -> 924 bytes
 .../Adwaita/assets/radio-unchecked-backdrop.png    |  Bin 532 -> 532 bytes
 .../Adwaita/assets/radio-unchecked-backdrop 2 png  |  Bin 919 -> 919 bytes
 .../theme/Adwaita/assets/radio-unchecked-dark.png  |  Bin 635 -> 635 bytes
 .../Adwaita/assets/radio-unchecked-dark 2 png      |  Bin 1229 -> 1229 bytes
 .../Adwaita/assets/radio-unchecked-hover-dark.png  |  Bin 646 -> 646 bytes
 .../assets/radio-unchecked-hover-dark 2 png        |  Bin 1262 -> 1262 bytes
 .../theme/Adwaita/assets/radio-unchecked-hover.png |  Bin 627 -> 627 bytes
 .../Adwaita/assets/radio-unchecked-hover 2 png     |  Bin 1206 -> 1206 bytes
 .../assets/radio-unchecked-insensitive-dark.png    |  Bin 513 -> 513 bytes
 .../assets/radio-unchecked-insensitive-dark 2 png  |  Bin 902 -> 902 bytes
 .../Adwaita/assets/radio-unchecked-insensitive.png |  Bin 536 -> 536 bytes
 .../assets/radio-unchecked-insensitive 2 png       |  Bin 924 -> 924 bytes
 .../theme/Adwaita/assets/radio-unchecked.png       |  Bin 656 -> 656 bytes
 .../theme/Adwaita/assets/radio-unchecked 2 png     |  Bin 1285 -> 1285 bytes
 .../assets/selected-checkbox-checked-active.png    |  Bin 676 -> 676 bytes
 .../assets/selected-checkbox-checked-active 2 png  |  Bin 1336 -> 1336 bytes
 ...ected-checkbox-checked-backdrop-insensitive.png |  Bin 586 -> 586 bytes
    ted-checkbox-checked-backdrop-insensitive 2 png |  Bin 964 -> 964 bytes
 .../assets/selected-checkbox-checked-backdrop.png  |  Bin 626 -> 626 bytes
 .../selected-checkbox-checked-backdrop 2 png       |  Bin 1071 -> 1071 bytes
 .../assets/selected-checkbox-checked-hover.png     |  Bin 676 -> 676 bytes
 .../assets/selected-checkbox-checked-hover 2 png   |  Bin 1310 -> 1310 bytes
 .../selected-checkbox-checked-insensitive.png      |  Bin 626 -> 626 bytes
 .../selected-checkbox-checked-insensitive 2 png    |  Bin 1044 -> 1044 bytes
 .../Adwaita/assets/selected-checkbox-checked.png   |  Bin 683 -> 683 bytes
 .../Adwaita/assets/selected-checkbox-checked 2 png |  Bin 1387 -> 1387 bytes
 .../assets/selected-checkbox-mixed-active.png      |  Bin 567 -> 567 bytes
 .../assets/selected-checkbox-mixed-active 2 png    |  Bin 1024 -> 1024 bytes
 ...elected-checkbox-mixed-backdrop-insensitive.png |  Bin 486 -> 486 bytes
    ected-checkbox-mixed-backdrop-insensitive 2 png |  Bin 805 -> 805 bytes
 .../assets/selected-checkbox-mixed-backdrop.png    |  Bin 492 -> 492 bytes
 .../assets/selected-checkbox-mixed-backdrop 2 png  |  Bin 816 -> 816 bytes
 .../assets/selected-checkbox-mixed-hover.png       |  Bin 518 -> 518 bytes
 .../assets/selected-checkbox-mixed-hover 2 png     |  Bin 952 -> 952 bytes
 .../assets/selected-checkbox-mixed-insensitive.png |  Bin 494 -> 494 bytes
 .../selected-checkbox-mixed-insensitive 2 png      |  Bin 814 -> 814 bytes
 .../Adwaita/assets/selected-checkbox-mixed.png     |  Bin 567 -> 567 bytes
 .../Adwaita/assets/selected-checkbox-mixed 2 png   |  Bin 1048 -> 1048 bytes
 .../assets/selected-checkbox-unchecked-active.png  |  Bin 491 -> 491 bytes
 .../selected-checkbox-unchecked-active 2 png       |  Bin 808 -> 808 bytes
 ...ted-checkbox-unchecked-backdrop-insensitive.png |  Bin 427 -> 427 bytes
    d-checkbox-unchecked-backdrop-insensitive 2 png |  Bin 667 -> 667 bytes
 .../selected-checkbox-unchecked-backdrop.png       |  Bin 429 -> 429 bytes
 .../selected-checkbox-unchecked-backdrop 2 png     |  Bin 669 -> 669 bytes
 .../assets/selected-checkbox-unchecked-hover.png   |  Bin 438 -> 438 bytes
 .../assets/selected-checkbox-unchecked-hover 2 png |  Bin 782 -> 782 bytes
 .../selected-checkbox-unchecked-insensitive.png    |  Bin 427 -> 427 bytes
 .../selected-checkbox-unchecked-insensitive 2 png  |  Bin 667 -> 667 bytes
 .../Adwaita/assets/selected-checkbox-unchecked.png |  Bin 464 -> 464 bytes
 .../assets/selected-checkbox-unchecked 2 png       |  Bin 851 -> 851 bytes
 .../assets/selected-radio-checked-active.png       |  Bin 818 -> 818 bytes
 .../assets/selected-radio-checked-active 2 png     |  Bin 1535 -> 1535 bytes
 ...selected-radio-checked-backdrop-insensitive.png |  Bin 663 -> 663 bytes
    lected-radio-checked-backdrop-insensitive 2 png |  Bin 1179 -> 1179 bytes
 .../assets/selected-radio-checked-backdrop.png     |  Bin 694 -> 694 bytes
 .../assets/selected-radio-checked-backdrop 2 png   |  Bin 1230 -> 1230 bytes
 .../assets/selected-radio-checked-hover.png        |  Bin 759 -> 759 bytes
 .../assets/selected-radio-checked-hover 2 png      |  Bin 1548 -> 1548 bytes
 .../assets/selected-radio-checked-insensitive.png  |  Bin 680 -> 680 bytes
 .../selected-radio-checked-insensitive 2 png       |  Bin 1214 -> 1214 bytes
 .../Adwaita/assets/selected-radio-checked.png      |  Bin 813 -> 813 bytes
 .../Adwaita/assets/selected-radio-checked 2 png    |  Bin 1655 -> 1655 bytes
 .../Adwaita/assets/selected-radio-mixed-active.png |  Bin 751 -> 751 bytes
 .../assets/selected-radio-mixed-active 2 png       |  Bin 1411 -> 1411 bytes
 .../selected-radio-mixed-backdrop-insensitive.png  |  Bin 635 -> 635 bytes
    selected-radio-mixed-backdrop-insensitive 2 png |  Bin 1114 -> 1114 bytes
 .../assets/selected-radio-mixed-backdrop.png       |  Bin 652 -> 652 bytes
 .../assets/selected-radio-mixed-backdrop 2 png     |  Bin 1128 -> 1128 bytes
 .../Adwaita/assets/selected-radio-mixed-hover.png  |  Bin 726 -> 726 bytes
 .../assets/selected-radio-mixed-hover 2 png        |  Bin 1436 -> 1436 bytes
 .../assets/selected-radio-mixed-insensitive.png    |  Bin 644 -> 644 bytes
 .../assets/selected-radio-mixed-insensitive 2 png  |  Bin 1130 -> 1130 bytes
 .../theme/Adwaita/assets/selected-radio-mixed.png  |  Bin 778 -> 778 bytes
 .../Adwaita/assets/selected-radio-mixed 2 png      |  Bin 1514 -> 1514 bytes
 .../assets/selected-radio-unchecked-active.png     |  Bin 673 -> 673 bytes
 .../assets/selected-radio-unchecked-active 2 png   |  Bin 1229 -> 1229 bytes
 ...lected-radio-unchecked-backdrop-insensitive.png |  Bin 578 -> 578 bytes
    cted-radio-unchecked-backdrop-insensitive 2 png |  Bin 992 -> 992 bytes
 .../assets/selected-radio-unchecked-backdrop.png   |  Bin 581 -> 581 bytes
 .../assets/selected-radio-unchecked-backdrop 2 png |  Bin 993 -> 993 bytes
 .../assets/selected-radio-unchecked-hover.png      |  Bin 664 -> 664 bytes
 .../assets/selected-radio-unchecked-hover 2 png    |  Bin 1290 -> 1290 bytes
 .../selected-radio-unchecked-insensitive.png       |  Bin 578 -> 578 bytes
 .../selected-radio-unchecked-insensitive 2 png     |  Bin 992 -> 992 bytes
 .../Adwaita/assets/selected-radio-unchecked.png    |  Bin 701 -> 701 bytes
 .../Adwaita/assets/selected-radio-unchecked 2 png  |  Bin 1371 -> 1371 bytes
 ...ider-horz-scale-has-marks-above-active-dark.png |  Bin 924 -> 924 bytes
    er-horz-scale-has-marks-above-active-dark 2 png |  Bin 2003 -> 2003 bytes
 .../slider-horz-scale-has-marks-above-active.png   |  Bin 933 -> 933 bytes
 .../slider-horz-scale-has-marks-above-active 2 png |  Bin 1964 -> 1964 bytes
 ...er-horz-scale-has-marks-above-backdrop-dark.png |  Bin 691 -> 691 bytes
    -horz-scale-has-marks-above-backdrop-dark 2 png |  Bin 1367 -> 1367 bytes
 ...e-has-marks-above-backdrop-insensitive-dark.png |  Bin 691 -> 691 bytes
    has-marks-above-backdrop-insensitive-dark 2 png |  Bin 1367 -> 1367 bytes
 ...-scale-has-marks-above-backdrop-insensitive.png |  Bin 753 -> 753 bytes
    cale-has-marks-above-backdrop-insensitive 2 png |  Bin 1414 -> 1414 bytes
 .../slider-horz-scale-has-marks-above-backdrop.png |  Bin 781 -> 781 bytes
    lider-horz-scale-has-marks-above-backdrop 2 png |  Bin 1408 -> 1408 bytes
 .../slider-horz-scale-has-marks-above-dark.png     |  Bin 844 -> 844 bytes
 .../slider-horz-scale-has-marks-above-dark 2 png   |  Bin 1842 -> 1842 bytes
 ...lider-horz-scale-has-marks-above-hover-dark.png |  Bin 896 -> 896 bytes
    der-horz-scale-has-marks-above-hover-dark 2 png |  Bin 1968 -> 1968 bytes
 .../slider-horz-scale-has-marks-above-hover.png    |  Bin 844 -> 844 bytes
 .../slider-horz-scale-has-marks-above-hover 2 png  |  Bin 1821 -> 1821 bytes
 ...horz-scale-has-marks-above-insensitive-dark.png |  Bin 691 -> 691 bytes
    rz-scale-has-marks-above-insensitive-dark 2 png |  Bin 1367 -> 1367 bytes
 ...ider-horz-scale-has-marks-above-insensitive.png |  Bin 753 -> 753 bytes
    er-horz-scale-has-marks-above-insensitive 2 png |  Bin 1414 -> 1414 bytes
 .../assets/slider-horz-scale-has-marks-above.png   |  Bin 911 -> 911 bytes
 .../assets/slider-horz-scale-has-marks-above 2 png |  Bin 1909 -> 1909 bytes
 ...ider-horz-scale-has-marks-below-active-dark.png |  Bin 914 -> 914 bytes
    er-horz-scale-has-marks-below-active-dark 2 png |  Bin 1968 -> 1968 bytes
 .../slider-horz-scale-has-marks-below-active.png   |  Bin 915 -> 915 bytes
 .../slider-horz-scale-has-marks-below-active 2 png |  Bin 1915 -> 1915 bytes
 ...er-horz-scale-has-marks-below-backdrop-dark.png |  Bin 728 -> 728 bytes
    -horz-scale-has-marks-below-backdrop-dark 2 png |  Bin 1373 -> 1373 bytes
 ...e-has-marks-below-backdrop-insensitive-dark.png |  Bin 728 -> 728 bytes
    has-marks-below-backdrop-insensitive-dark 2 png |  Bin 1373 -> 1373 bytes
 ...-scale-has-marks-below-backdrop-insensitive.png |  Bin 799 -> 799 bytes
    cale-has-marks-below-backdrop-insensitive 2 png |  Bin 1461 -> 1461 bytes
 .../slider-horz-scale-has-marks-below-backdrop.png |  Bin 816 -> 816 bytes
    lider-horz-scale-has-marks-below-backdrop 2 png |  Bin 1447 -> 1447 bytes
 .../slider-horz-scale-has-marks-below-dark.png     |  Bin 855 -> 855 bytes
 .../slider-horz-scale-has-marks-below-dark 2 png   |  Bin 1848 -> 1848 bytes
 ...lider-horz-scale-has-marks-below-hover-dark.png |  Bin 900 -> 900 bytes
    der-horz-scale-has-marks-below-hover-dark 2 png |  Bin 1922 -> 1922 bytes
 .../slider-horz-scale-has-marks-below-hover.png    |  Bin 870 -> 870 bytes
 .../slider-horz-scale-has-marks-below-hover 2 png  |  Bin 1723 -> 1723 bytes
 ...horz-scale-has-marks-below-insensitive-dark.png |  Bin 728 -> 728 bytes
    rz-scale-has-marks-below-insensitive-dark 2 png |  Bin 1373 -> 1373 bytes
 ...ider-horz-scale-has-marks-below-insensitive.png |  Bin 799 -> 799 bytes
    er-horz-scale-has-marks-below-insensitive 2 png |  Bin 1461 -> 1461 bytes
 .../assets/slider-horz-scale-has-marks-below.png   |  Bin 917 -> 917 bytes
 .../assets/slider-horz-scale-has-marks-below 2 png |  Bin 1891 -> 1891 bytes
 ...ider-vert-scale-has-marks-above-active-dark.png |  Bin 913 -> 913 bytes
    er-vert-scale-has-marks-above-active-dark 2 png |  Bin 1905 -> 1905 bytes
 .../slider-vert-scale-has-marks-above-active.png   |  Bin 935 -> 935 bytes
 .../slider-vert-scale-has-marks-above-active 2 png |  Bin 1823 -> 1823 bytes
 ...er-vert-scale-has-marks-above-backdrop-dark.png |  Bin 602 -> 602 bytes
    -vert-scale-has-marks-above-backdrop-dark 2 png |  Bin 1179 -> 1179 bytes
 ...e-has-marks-above-backdrop-insensitive-dark.png |  Bin 602 -> 602 bytes
    has-marks-above-backdrop-insensitive-dark 2 png |  Bin 1179 -> 1179 bytes
 ...-scale-has-marks-above-backdrop-insensitive.png |  Bin 671 -> 671 bytes
    cale-has-marks-above-backdrop-insensitive 2 png |  Bin 1263 -> 1263 bytes
 .../slider-vert-scale-has-marks-above-backdrop.png |  Bin 689 -> 689 bytes
    lider-vert-scale-has-marks-above-backdrop 2 png |  Bin 1253 -> 1253 bytes
 .../slider-vert-scale-has-marks-above-dark.png     |  Bin 867 -> 867 bytes
 .../slider-vert-scale-has-marks-above-dark 2 png   |  Bin 1782 -> 1782 bytes
 ...lider-vert-scale-has-marks-above-hover-dark.png |  Bin 918 -> 918 bytes
    der-vert-scale-has-marks-above-hover-dark 2 png |  Bin 1878 -> 1878 bytes
 .../slider-vert-scale-has-marks-above-hover.png    |  Bin 848 -> 848 bytes
 .../slider-vert-scale-has-marks-above-hover 2 png  |  Bin 1685 -> 1685 bytes
 ...vert-scale-has-marks-above-insensitive-dark.png |  Bin 602 -> 602 bytes
    rt-scale-has-marks-above-insensitive-dark 2 png |  Bin 1179 -> 1179 bytes
 ...ider-vert-scale-has-marks-above-insensitive.png |  Bin 671 -> 671 bytes
    er-vert-scale-has-marks-above-insensitive 2 png |  Bin 1263 -> 1263 bytes
 .../assets/slider-vert-scale-has-marks-above.png   |  Bin 912 -> 912 bytes
 .../assets/slider-vert-scale-has-marks-above 2 png |  Bin 1826 -> 1826 bytes
 ...ider-vert-scale-has-marks-below-active-dark.png |  Bin 929 -> 929 bytes
    er-vert-scale-has-marks-below-active-dark 2 png |  Bin 1924 -> 1924 bytes
 .../slider-vert-scale-has-marks-below-active.png   |  Bin 955 -> 955 bytes
 .../slider-vert-scale-has-marks-below-active 2 png |  Bin 1832 -> 1832 bytes
 ...er-vert-scale-has-marks-below-backdrop-dark.png |  Bin 592 -> 592 bytes
    -vert-scale-has-marks-below-backdrop-dark 2 png |  Bin 1203 -> 1203 bytes
 ...e-has-marks-below-backdrop-insensitive-dark.png |  Bin 592 -> 592 bytes
    has-marks-below-backdrop-insensitive-dark 2 png |  Bin 1203 -> 1203 bytes
 ...-scale-has-marks-below-backdrop-insensitive.png |  Bin 679 -> 679 bytes
    cale-has-marks-below-backdrop-insensitive 2 png |  Bin 1314 -> 1314 bytes
 .../slider-vert-scale-has-marks-below-backdrop.png |  Bin 697 -> 697 bytes
    lider-vert-scale-has-marks-below-backdrop 2 png |  Bin 1297 -> 1297 bytes
 .../slider-vert-scale-has-marks-below-dark.png     |  Bin 872 -> 872 bytes
 .../slider-vert-scale-has-marks-below-dark 2 png   |  Bin 1784 -> 1784 bytes
 ...lider-vert-scale-has-marks-below-hover-dark.png |  Bin 911 -> 911 bytes
    der-vert-scale-has-marks-below-hover-dark 2 png |  Bin 1883 -> 1883 bytes
 .../slider-vert-scale-has-marks-below-hover.png    |  Bin 886 -> 886 bytes
 .../slider-vert-scale-has-marks-below-hover 2 png  |  Bin 1729 -> 1729 bytes
 ...vert-scale-has-marks-below-insensitive-dark.png |  Bin 592 -> 592 bytes
    rt-scale-has-marks-below-insensitive-dark 2 png |  Bin 1203 -> 1203 bytes
 ...ider-vert-scale-has-marks-below-insensitive.png |  Bin 679 -> 679 bytes
    er-vert-scale-has-marks-below-insensitive 2 png |  Bin 1314 -> 1314 bytes
 .../assets/slider-vert-scale-has-marks-below.png   |  Bin 932 -> 932 bytes
 .../assets/slider-vert-scale-has-marks-below 2 png |  Bin 1865 -> 1865 bytes
 .../theme/Adwaita/gtk-contained-dark.css           |    0
 .../theme/Adwaita/gtk-contained-dark.scss          |    0
 .../theme/Adwaita/gtk-contained.css                |    0
 .../theme/Adwaita/gtk-contained.scss               |    0
 gtk/{resources => }/theme/Adwaita/gtk-dark.css     |    0
 gtk/{resources => }/theme/Adwaita/gtk.css          |    0
 gtk/{resources => }/theme/Adwaita/parse-sass.sh    |    0
 gtk/{resources => }/theme/Adwaita/render-assets.sh |    0
 gtk/{resources => }/theme/HighContrast/Gemfile     |    0
 .../theme/HighContrast/_colors.scss                |    0
 .../theme/HighContrast/_common.scss                |    0
 .../theme/HighContrast/_drawing.scss               |    0
 gtk/{resources => }/theme/HighContrast/gtk.css     |    0
 gtk/{resources => }/theme/HighContrast/gtk.scss    |    0
 .../theme/HighContrast/parse-sass.sh               |    0
 gtk/{resources => }/theme/Raleigh/gtk-default.css  |    0
 gtk/{resources => }/theme/win32/gtk-win32-base.css |    0
 .../theme/win32/gtk-win32-classic.css              |    0
 gtk/{resources => }/theme/win32/gtk-win32-xp.css   |    0
 gtk/{resources => }/theme/win32/gtk-win32.css      |    0
 gtk/{resources => }/ui/gtkaboutdialog.ui           |    0
 gtk/{resources => }/ui/gtkaboutdialog.ui.h         |    0
 gtk/{resources => }/ui/gtkactionbar.ui             |    0
 gtk/{resources => }/ui/gtkactionbar.ui.h           |    0
 gtk/{resources => }/ui/gtkappchooserdialog.ui      |    0
 gtk/{resources => }/ui/gtkappchooserdialog.ui.h    |    0
 gtk/{resources => }/ui/gtkappchooserwidget.ui      |    0
 gtk/{resources => }/ui/gtkappchooserwidget.ui.h    |    0
 gtk/{resources => }/ui/gtkapplication-quartz.ui    |    0
 gtk/{resources => }/ui/gtkapplication-quartz.ui.h  |    0
 gtk/{resources => }/ui/gtkassistant.ui             |    0
 gtk/{resources => }/ui/gtkassistant.ui.h           |    0
 gtk/{resources => }/ui/gtkcolorchooserdialog.ui    |    0
 gtk/{resources => }/ui/gtkcolorchooserdialog.ui.h  |    0
 gtk/{resources => }/ui/gtkcoloreditor.ui           |    0
 gtk/{resources => }/ui/gtkcoloreditor.ui.h         |    0
 gtk/{resources => }/ui/gtkdialog.ui                |    0
 gtk/{resources => }/ui/gtkdialog.ui.h              |    0
 gtk/{resources => }/ui/gtkfilechooserbutton.ui     |    0
 gtk/{resources => }/ui/gtkfilechooserbutton.ui.h   |    0
 gtk/{resources => }/ui/gtkfilechooserdialog.ui     |    0
 gtk/{resources => }/ui/gtkfilechooserdialog.ui.h   |    0
 gtk/{resources => }/ui/gtkfilechooserwidget.ui     |    0
 gtk/{resources => }/ui/gtkfilechooserwidget.ui.h   |    0
 gtk/{resources => }/ui/gtkfontbutton.ui            |    0
 gtk/{resources => }/ui/gtkfontbutton.ui.h          |    0
 gtk/{resources => }/ui/gtkfontchooserdialog.ui     |    0
 gtk/{resources => }/ui/gtkfontchooserdialog.ui.h   |    0
 gtk/{resources => }/ui/gtkfontchooserwidget.ui     |    0
 gtk/{resources => }/ui/gtkfontchooserwidget.ui.h   |    0
 gtk/{resources => }/ui/gtkinfobar.ui               |    0
 gtk/{resources => }/ui/gtkinfobar.ui.h             |    0
 gtk/{resources => }/ui/gtklockbutton.ui            |    0
 gtk/{resources => }/ui/gtklockbutton.ui.h          |    0
 gtk/{resources => }/ui/gtkmessagedialog.ui         |    0
 gtk/{resources => }/ui/gtkmessagedialog.ui.h       |    0
 gtk/{resources => }/ui/gtkpagesetupunixdialog.ui   |    0
 gtk/{resources => }/ui/gtkpagesetupunixdialog.ui.h |    0
 gtk/{resources => }/ui/gtkpathbar.ui               |    0
 gtk/{resources => }/ui/gtkpathbar.ui.h             |    0
 gtk/{resources => }/ui/gtkprintunixdialog.ui       |    0
 gtk/{resources => }/ui/gtkprintunixdialog.ui.h     |    0
 gtk/{resources => }/ui/gtkrecentchooserdefault.ui  |    0
 .../ui/gtkrecentchooserdefault.ui.h                |    0
 gtk/{resources => }/ui/gtkscalebutton.ui           |    0
 gtk/{resources => }/ui/gtkscalebutton.ui.h         |    0
 gtk/{resources => }/ui/gtksearchbar.ui             |    0
 gtk/{resources => }/ui/gtksearchbar.ui.h           |    0
 gtk/{resources => }/ui/gtkstatusbar.ui             |    0
 gtk/{resources => }/ui/gtkstatusbar.ui.h           |    0
 gtk/{resources => }/ui/gtkvolumebutton.ui          |    0
 gtk/{resources => }/ui/gtkvolumebutton.ui.h        |    0
 po/POTFILES.in                                     |   48 ++++----
 po/POTFILES.skip                                   |   48 ++++----
 461 files changed, 114 insertions(+), 114 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 5b4a871..16b1161 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1312,35 +1312,35 @@ pkgdata_DATA = gtkbuilder.rng
 
 EXTRA_DIST += gtkbuilder.rnc gtkbuilder.rng
 
-COMPOSITE_TEMPLATES =                          \
-       resources/ui/gtkapplication-quartz.ui   \
-       resources/ui/gtkaboutdialog.ui          \
-       resources/ui/gtkactionbar.ui            \
-       resources/ui/gtkappchooserdialog.ui     \
-       resources/ui/gtkappchooserwidget.ui     \
-       resources/ui/gtkassistant.ui            \
-       resources/ui/gtkcolorchooserdialog.ui   \
-       resources/ui/gtkcoloreditor.ui          \
-       resources/ui/gtkdialog.ui               \
-       resources/ui/gtkfilechooserbutton.ui    \
-       resources/ui/gtkfilechooserwidget.ui    \
-       resources/ui/gtkfilechooserdialog.ui    \
-       resources/ui/gtkfontbutton.ui           \
-       resources/ui/gtkfontchooserdialog.ui    \
-       resources/ui/gtkfontchooserwidget.ui    \
-       resources/ui/gtkinfobar.ui              \
-       resources/ui/gtklockbutton.ui           \
-       resources/ui/gtkmessagedialog.ui        \
-       resources/ui/gtkpagesetupunixdialog.ui  \
-       resources/ui/gtkpathbar.ui              \
-       resources/ui/gtkprintunixdialog.ui      \
-       resources/ui/gtkrecentchooserdefault.ui \
-       resources/ui/gtksearchbar.ui            \
-       resources/ui/gtkscalebutton.ui          \
-       resources/ui/gtkstatusbar.ui            \
-       resources/ui/gtkvolumebutton.ui
-
-template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h)
+templates =                            \
+       ui/gtkapplication-quartz.ui     \
+       ui/gtkaboutdialog.ui            \
+       ui/gtkactionbar.ui              \
+       ui/gtkappchooserdialog.ui       \
+       ui/gtkappchooserwidget.ui       \
+       ui/gtkassistant.ui              \
+       ui/gtkcolorchooserdialog.ui     \
+       ui/gtkcoloreditor.ui            \
+       ui/gtkdialog.ui         \
+       ui/gtkfilechooserbutton.ui      \
+       ui/gtkfilechooserwidget.ui      \
+       ui/gtkfilechooserdialog.ui      \
+       ui/gtkfontbutton.ui             \
+       ui/gtkfontchooserdialog.ui      \
+       ui/gtkfontchooserwidget.ui      \
+       ui/gtkinfobar.ui                \
+       ui/gtklockbutton.ui             \
+       ui/gtkmessagedialog.ui  \
+       ui/gtkpagesetupunixdialog.ui    \
+       ui/gtkpathbar.ui                \
+       ui/gtkprintunixdialog.ui        \
+       ui/gtkrecentchooserdefault.ui   \
+       ui/gtksearchbar.ui              \
+       ui/gtkscalebutton.ui            \
+       ui/gtkstatusbar.ui              \
+       ui/gtkvolumebutton.ui
+
+template_headers = $(templates:.ui=.ui.h)
 
 %.ui.h: %.ui
        $(AM_V_GEN) mkdir -p $(dir $@) \
@@ -1393,7 +1393,7 @@ gtk.gresource.xml: Makefile.am
        $(AM_V_GEN) $(ECHO) "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@; \
        $(ECHO) "<gresources>" >> $@; \
        $(ECHO) "  <gresource prefix=\"/org/gtk/libgtk\">" >> $@; \
-       for f in $(srcdir)/resources/theme/Raleigh/*.css; do \
+       for f in $(srcdir)/theme/Raleigh/*.css; do \
          n=`basename $$f`; \
          $(ECHO) "    <file alias=\"theme/Raleigh.css\">theme/Raleigh/$$n</file>" >> $@; \
        done; \
@@ -1401,27 +1401,27 @@ gtk.gresource.xml: Makefile.am
         $(ECHO) "    <file alias=\"theme/Adwaita-dark.css\">theme/Adwaita/gtk-dark.css</file>" >> $@; \
         $(ECHO) "    <file>theme/Adwaita/gtk-contained.css</file>" >> $@; \
         $(ECHO) "    <file>theme/Adwaita/gtk-contained-dark.css</file>" >> $@; \
-        for f in $(srcdir)/resources/theme/Adwaita/assets/*; do \
+        for f in $(srcdir)/theme/Adwaita/assets/*; do \
           n=`basename $$f`; \
           $(ECHO) "    <file preprocess=\"to-pixdata\">theme/Adwaita/assets/$$n</file>" >> $@; \
         done; \
        $(ECHO) "    <file alias=\"theme/HighContrast.css\">theme/HighContrast/gtk.css</file>" >> $@; \
        if test "$(win32_theme)" = "yes"; then \
-         for f in $(srcdir)/resources/theme/win32/*.css; do \
+         for f in $(srcdir)/theme/win32/*.css; do \
            n=`basename $$f`; \
            $(ECHO) "    <file alias=\"theme/$$n\">theme/win32/$$n</file>" >> $@; \
          done; \
        fi; \
-       for f in $(srcdir)/resources/cursor/*.png; do \
+       for f in $(srcdir)/cursor/*.png; do \
          n=`basename $$f`; \
          $(ECHO) "    <file>cursor/$$n</file>" >> $@; \
        done; \
-       for f in $(srcdir)/resources/ui/*.ui; do \
+       for f in $(srcdir)/ui/*.ui; do \
          n=`basename $$f`; \
          $(ECHO) "    <file compressed=\"true\">ui/$$n</file>" >> $@; \
        done; \
        for s in 16x16 22x22 24x24 32x32; do \
-         for f in $(srcdir)/resources/icons/$$s/actions/*.png; do \
+         for f in $(srcdir)/icons/$$s/actions/*.png; do \
            n=`basename $$f`; \
            $(ECHO) "    <file>icons/$$s/actions/$$n</file>" >> $@; \
          done; \
@@ -1430,49 +1430,49 @@ gtk.gresource.xml: Makefile.am
        $(ECHO) "</gresources>" >> $@;
 
 win32_theme_sources = \
-       resources/theme/win32/gtk-win32.css \
-       resources/theme/win32/gtk-win32-base.css \
-       resources/theme/win32/gtk-win32-classic.css \
-       resources/theme/win32/gtk-win32-xp.css
+       theme/win32/gtk-win32.css \
+       theme/win32/gtk-win32-base.css \
+       theme/win32/gtk-win32-classic.css \
+       theme/win32/gtk-win32-xp.css
 
 adwaita_sources = \
-       resources/theme/Adwaita/assets.txt \
-       resources/theme/Adwaita/assets.svg \
-       resources/theme/Adwaita/_colors-public.scss \
-       resources/theme/Adwaita/_colors.scss \
-       resources/theme/Adwaita/_common.scss \
-       resources/theme/Adwaita/_drawing.scss \
-       resources/theme/Adwaita/gtk-contained-dark.scss \
-       resources/theme/Adwaita/gtk-contained.scss \
-       resources/theme/Adwaita/parse-sass.sh \
-       resources/theme/Adwaita/render-assets.sh \
-       resources/theme/Adwaita/Gemfile \
-       resources/theme/Adwaita/README \
-       resources/theme/Adwaita/gtk-contained.css \
-       resources/theme/Adwaita/gtk-contained-dark.css \
-       resources/theme/Adwaita/gtk.css \
-       resources/theme/Adwaita/gtk-dark.css
+       theme/Adwaita/assets.txt \
+       theme/Adwaita/assets.svg \
+       theme/Adwaita/_colors-public.scss \
+       theme/Adwaita/_colors.scss \
+       theme/Adwaita/_common.scss \
+       theme/Adwaita/_drawing.scss \
+       theme/Adwaita/gtk-contained-dark.scss \
+       theme/Adwaita/gtk-contained.scss \
+       theme/Adwaita/parse-sass.sh \
+       theme/Adwaita/render-assets.sh \
+       theme/Adwaita/Gemfile \
+       theme/Adwaita/README \
+       theme/Adwaita/gtk-contained.css \
+       theme/Adwaita/gtk-contained-dark.css \
+       theme/Adwaita/gtk.css \
+       theme/Adwaita/gtk-dark.css
 
 highcontrast_sources = \
-       resources/theme/HighContrast/_colors.scss \
-       resources/theme/HighContrast/_common.scss \
-       resources/theme/HighContrast/_drawing.scss \
-       resources/theme/HighContrast/Gemfile \
-       resources/theme/HighContrast/gtk.css \
-       resources/theme/HighContrast/gtk.scss \
-       resources/theme/HighContrast/parse-sass.sh
+       theme/HighContrast/_colors.scss \
+       theme/HighContrast/_common.scss \
+       theme/HighContrast/_drawing.scss \
+       theme/HighContrast/Gemfile \
+       theme/HighContrast/gtk.css \
+       theme/HighContrast/gtk.scss \
+       theme/HighContrast/parse-sass.sh
 
 raleigh_sources = \
-       resources/theme/Raleigh/gtk-default.css
+       theme/Raleigh/gtk-default.css
 
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies 
$(builddir)/gtk.gresource.xml)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(builddir)/gtk.gresource.xml)
 
 gtkresources.h: gtk.gresource.xml
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
-               --target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-header --manual-register
+               --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header --manual-register
 gtkresources.c: gtk.gresource.xml $(resource_files) $(template_headers)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
-               --target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-source --manual-register
+               --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source --manual-register
 
 gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h
        @true
diff --git a/gtk/resources/theme/Adwaita/Gemfile b/gtk/theme/Adwaita/Gemfile
similarity index 100%
rename from gtk/resources/theme/Adwaita/Gemfile
rename to gtk/theme/Adwaita/Gemfile
diff --git a/gtk/resources/theme/Adwaita/README b/gtk/theme/Adwaita/README
similarity index 100%
rename from gtk/resources/theme/Adwaita/README
rename to gtk/theme/Adwaita/README
diff --git a/gtk/resources/theme/Adwaita/_colors-public.scss b/gtk/theme/Adwaita/_colors-public.scss
similarity index 100%
rename from gtk/resources/theme/Adwaita/_colors-public.scss
rename to gtk/theme/Adwaita/_colors-public.scss
diff --git a/gtk/resources/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss
similarity index 100%
rename from gtk/resources/theme/Adwaita/_colors.scss
rename to gtk/theme/Adwaita/_colors.scss
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
similarity index 100%
rename from gtk/resources/theme/Adwaita/_common.scss
rename to gtk/theme/Adwaita/_common.scss
diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
similarity index 100%
rename from gtk/resources/theme/Adwaita/_drawing.scss
rename to gtk/theme/Adwaita/_drawing.scss
diff --git a/gtk/resources/theme/Adwaita/assets.svg b/gtk/theme/Adwaita/assets.svg
similarity index 100%
rename from gtk/resources/theme/Adwaita/assets.svg
rename to gtk/theme/Adwaita/assets.svg
diff --git a/gtk/resources/theme/Adwaita/assets.txt b/gtk/theme/Adwaita/assets.txt
similarity index 100%
rename from gtk/resources/theme/Adwaita/assets.txt
rename to gtk/theme/Adwaita/assets.txt
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
similarity index 100%
rename from gtk/resources/theme/Adwaita/gtk-contained-dark.css
rename to gtk/theme/Adwaita/gtk-contained-dark.css
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.scss b/gtk/theme/Adwaita/gtk-contained-dark.scss
similarity index 100%
rename from gtk/resources/theme/Adwaita/gtk-contained-dark.scss
rename to gtk/theme/Adwaita/gtk-contained-dark.scss
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
similarity index 100%
rename from gtk/resources/theme/Adwaita/gtk-contained.css
rename to gtk/theme/Adwaita/gtk-contained.css
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.scss b/gtk/theme/Adwaita/gtk-contained.scss
similarity index 100%
rename from gtk/resources/theme/Adwaita/gtk-contained.scss
rename to gtk/theme/Adwaita/gtk-contained.scss
diff --git a/gtk/resources/theme/Adwaita/gtk-dark.css b/gtk/theme/Adwaita/gtk-dark.css
similarity index 100%
rename from gtk/resources/theme/Adwaita/gtk-dark.css
rename to gtk/theme/Adwaita/gtk-dark.css
diff --git a/gtk/resources/theme/Adwaita/gtk.css b/gtk/theme/Adwaita/gtk.css
similarity index 100%
rename from gtk/resources/theme/Adwaita/gtk.css
rename to gtk/theme/Adwaita/gtk.css
diff --git a/gtk/resources/theme/Adwaita/parse-sass.sh b/gtk/theme/Adwaita/parse-sass.sh
similarity index 100%
rename from gtk/resources/theme/Adwaita/parse-sass.sh
rename to gtk/theme/Adwaita/parse-sass.sh
diff --git a/gtk/resources/theme/Adwaita/render-assets.sh b/gtk/theme/Adwaita/render-assets.sh
similarity index 100%
rename from gtk/resources/theme/Adwaita/render-assets.sh
rename to gtk/theme/Adwaita/render-assets.sh
diff --git a/gtk/resources/theme/HighContrast/Gemfile b/gtk/theme/HighContrast/Gemfile
similarity index 100%
rename from gtk/resources/theme/HighContrast/Gemfile
rename to gtk/theme/HighContrast/Gemfile
diff --git a/gtk/resources/theme/HighContrast/_colors.scss b/gtk/theme/HighContrast/_colors.scss
similarity index 100%
rename from gtk/resources/theme/HighContrast/_colors.scss
rename to gtk/theme/HighContrast/_colors.scss
diff --git a/gtk/resources/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
similarity index 100%
rename from gtk/resources/theme/HighContrast/_common.scss
rename to gtk/theme/HighContrast/_common.scss
diff --git a/gtk/resources/theme/HighContrast/_drawing.scss b/gtk/theme/HighContrast/_drawing.scss
similarity index 100%
rename from gtk/resources/theme/HighContrast/_drawing.scss
rename to gtk/theme/HighContrast/_drawing.scss
diff --git a/gtk/resources/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
similarity index 100%
rename from gtk/resources/theme/HighContrast/gtk.css
rename to gtk/theme/HighContrast/gtk.css
diff --git a/gtk/resources/theme/HighContrast/gtk.scss b/gtk/theme/HighContrast/gtk.scss
similarity index 100%
rename from gtk/resources/theme/HighContrast/gtk.scss
rename to gtk/theme/HighContrast/gtk.scss
diff --git a/gtk/resources/theme/HighContrast/parse-sass.sh b/gtk/theme/HighContrast/parse-sass.sh
similarity index 100%
rename from gtk/resources/theme/HighContrast/parse-sass.sh
rename to gtk/theme/HighContrast/parse-sass.sh
diff --git a/gtk/resources/theme/Raleigh/gtk-default.css b/gtk/theme/Raleigh/gtk-default.css
similarity index 100%
rename from gtk/resources/theme/Raleigh/gtk-default.css
rename to gtk/theme/Raleigh/gtk-default.css
diff --git a/gtk/resources/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
similarity index 100%
rename from gtk/resources/theme/win32/gtk-win32-base.css
rename to gtk/theme/win32/gtk-win32-base.css
diff --git a/gtk/resources/theme/win32/gtk-win32-classic.css b/gtk/theme/win32/gtk-win32-classic.css
similarity index 100%
rename from gtk/resources/theme/win32/gtk-win32-classic.css
rename to gtk/theme/win32/gtk-win32-classic.css
diff --git a/gtk/resources/theme/win32/gtk-win32-xp.css b/gtk/theme/win32/gtk-win32-xp.css
similarity index 100%
rename from gtk/resources/theme/win32/gtk-win32-xp.css
rename to gtk/theme/win32/gtk-win32-xp.css
diff --git a/gtk/resources/theme/win32/gtk-win32.css b/gtk/theme/win32/gtk-win32.css
similarity index 100%
rename from gtk/resources/theme/win32/gtk-win32.css
rename to gtk/theme/win32/gtk-win32.css
diff --git a/gtk/resources/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
similarity index 100%
rename from gtk/resources/ui/gtkaboutdialog.ui
rename to gtk/ui/gtkaboutdialog.ui
diff --git a/gtk/resources/ui/gtkaboutdialog.ui.h b/gtk/ui/gtkaboutdialog.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkaboutdialog.ui.h
rename to gtk/ui/gtkaboutdialog.ui.h
diff --git a/gtk/resources/ui/gtkactionbar.ui b/gtk/ui/gtkactionbar.ui
similarity index 100%
rename from gtk/resources/ui/gtkactionbar.ui
rename to gtk/ui/gtkactionbar.ui
diff --git a/gtk/resources/ui/gtkactionbar.ui.h b/gtk/ui/gtkactionbar.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkactionbar.ui.h
rename to gtk/ui/gtkactionbar.ui.h
diff --git a/gtk/resources/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
similarity index 100%
rename from gtk/resources/ui/gtkappchooserdialog.ui
rename to gtk/ui/gtkappchooserdialog.ui
diff --git a/gtk/resources/ui/gtkappchooserdialog.ui.h b/gtk/ui/gtkappchooserdialog.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkappchooserdialog.ui.h
rename to gtk/ui/gtkappchooserdialog.ui.h
diff --git a/gtk/resources/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui
similarity index 100%
rename from gtk/resources/ui/gtkappchooserwidget.ui
rename to gtk/ui/gtkappchooserwidget.ui
diff --git a/gtk/resources/ui/gtkappchooserwidget.ui.h b/gtk/ui/gtkappchooserwidget.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkappchooserwidget.ui.h
rename to gtk/ui/gtkappchooserwidget.ui.h
diff --git a/gtk/resources/ui/gtkapplication-quartz.ui b/gtk/ui/gtkapplication-quartz.ui
similarity index 100%
rename from gtk/resources/ui/gtkapplication-quartz.ui
rename to gtk/ui/gtkapplication-quartz.ui
diff --git a/gtk/resources/ui/gtkapplication-quartz.ui.h b/gtk/ui/gtkapplication-quartz.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkapplication-quartz.ui.h
rename to gtk/ui/gtkapplication-quartz.ui.h
diff --git a/gtk/resources/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
similarity index 100%
rename from gtk/resources/ui/gtkassistant.ui
rename to gtk/ui/gtkassistant.ui
diff --git a/gtk/resources/ui/gtkassistant.ui.h b/gtk/ui/gtkassistant.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkassistant.ui.h
rename to gtk/ui/gtkassistant.ui.h
diff --git a/gtk/resources/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
similarity index 100%
rename from gtk/resources/ui/gtkcolorchooserdialog.ui
rename to gtk/ui/gtkcolorchooserdialog.ui
diff --git a/gtk/resources/ui/gtkcolorchooserdialog.ui.h b/gtk/ui/gtkcolorchooserdialog.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkcolorchooserdialog.ui.h
rename to gtk/ui/gtkcolorchooserdialog.ui.h
diff --git a/gtk/resources/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
similarity index 100%
rename from gtk/resources/ui/gtkcoloreditor.ui
rename to gtk/ui/gtkcoloreditor.ui
diff --git a/gtk/resources/ui/gtkcoloreditor.ui.h b/gtk/ui/gtkcoloreditor.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkcoloreditor.ui.h
rename to gtk/ui/gtkcoloreditor.ui.h
diff --git a/gtk/resources/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
similarity index 100%
rename from gtk/resources/ui/gtkdialog.ui
rename to gtk/ui/gtkdialog.ui
diff --git a/gtk/resources/ui/gtkdialog.ui.h b/gtk/ui/gtkdialog.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkdialog.ui.h
rename to gtk/ui/gtkdialog.ui.h
diff --git a/gtk/resources/ui/gtkfilechooserbutton.ui b/gtk/ui/gtkfilechooserbutton.ui
similarity index 100%
rename from gtk/resources/ui/gtkfilechooserbutton.ui
rename to gtk/ui/gtkfilechooserbutton.ui
diff --git a/gtk/resources/ui/gtkfilechooserbutton.ui.h b/gtk/ui/gtkfilechooserbutton.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkfilechooserbutton.ui.h
rename to gtk/ui/gtkfilechooserbutton.ui.h
diff --git a/gtk/resources/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
similarity index 100%
rename from gtk/resources/ui/gtkfilechooserdialog.ui
rename to gtk/ui/gtkfilechooserdialog.ui
diff --git a/gtk/resources/ui/gtkfilechooserdialog.ui.h b/gtk/ui/gtkfilechooserdialog.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkfilechooserdialog.ui.h
rename to gtk/ui/gtkfilechooserdialog.ui.h
diff --git a/gtk/resources/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
similarity index 100%
rename from gtk/resources/ui/gtkfilechooserwidget.ui
rename to gtk/ui/gtkfilechooserwidget.ui
diff --git a/gtk/resources/ui/gtkfilechooserwidget.ui.h b/gtk/ui/gtkfilechooserwidget.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkfilechooserwidget.ui.h
rename to gtk/ui/gtkfilechooserwidget.ui.h
diff --git a/gtk/resources/ui/gtkfontbutton.ui b/gtk/ui/gtkfontbutton.ui
similarity index 100%
rename from gtk/resources/ui/gtkfontbutton.ui
rename to gtk/ui/gtkfontbutton.ui
diff --git a/gtk/resources/ui/gtkfontbutton.ui.h b/gtk/ui/gtkfontbutton.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkfontbutton.ui.h
rename to gtk/ui/gtkfontbutton.ui.h
diff --git a/gtk/resources/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
similarity index 100%
rename from gtk/resources/ui/gtkfontchooserdialog.ui
rename to gtk/ui/gtkfontchooserdialog.ui
diff --git a/gtk/resources/ui/gtkfontchooserdialog.ui.h b/gtk/ui/gtkfontchooserdialog.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkfontchooserdialog.ui.h
rename to gtk/ui/gtkfontchooserdialog.ui.h
diff --git a/gtk/resources/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
similarity index 100%
rename from gtk/resources/ui/gtkfontchooserwidget.ui
rename to gtk/ui/gtkfontchooserwidget.ui
diff --git a/gtk/resources/ui/gtkfontchooserwidget.ui.h b/gtk/ui/gtkfontchooserwidget.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkfontchooserwidget.ui.h
rename to gtk/ui/gtkfontchooserwidget.ui.h
diff --git a/gtk/resources/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
similarity index 100%
rename from gtk/resources/ui/gtkinfobar.ui
rename to gtk/ui/gtkinfobar.ui
diff --git a/gtk/resources/ui/gtkinfobar.ui.h b/gtk/ui/gtkinfobar.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkinfobar.ui.h
rename to gtk/ui/gtkinfobar.ui.h
diff --git a/gtk/resources/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui
similarity index 100%
rename from gtk/resources/ui/gtklockbutton.ui
rename to gtk/ui/gtklockbutton.ui
diff --git a/gtk/resources/ui/gtklockbutton.ui.h b/gtk/ui/gtklockbutton.ui.h
similarity index 100%
rename from gtk/resources/ui/gtklockbutton.ui.h
rename to gtk/ui/gtklockbutton.ui.h
diff --git a/gtk/resources/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
similarity index 100%
rename from gtk/resources/ui/gtkmessagedialog.ui
rename to gtk/ui/gtkmessagedialog.ui
diff --git a/gtk/resources/ui/gtkmessagedialog.ui.h b/gtk/ui/gtkmessagedialog.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkmessagedialog.ui.h
rename to gtk/ui/gtkmessagedialog.ui.h
diff --git a/gtk/resources/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
similarity index 100%
rename from gtk/resources/ui/gtkpagesetupunixdialog.ui
rename to gtk/ui/gtkpagesetupunixdialog.ui
diff --git a/gtk/resources/ui/gtkpagesetupunixdialog.ui.h b/gtk/ui/gtkpagesetupunixdialog.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkpagesetupunixdialog.ui.h
rename to gtk/ui/gtkpagesetupunixdialog.ui.h
diff --git a/gtk/resources/ui/gtkpathbar.ui b/gtk/ui/gtkpathbar.ui
similarity index 100%
rename from gtk/resources/ui/gtkpathbar.ui
rename to gtk/ui/gtkpathbar.ui
diff --git a/gtk/resources/ui/gtkpathbar.ui.h b/gtk/ui/gtkpathbar.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkpathbar.ui.h
rename to gtk/ui/gtkpathbar.ui.h
diff --git a/gtk/resources/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
similarity index 100%
rename from gtk/resources/ui/gtkprintunixdialog.ui
rename to gtk/ui/gtkprintunixdialog.ui
diff --git a/gtk/resources/ui/gtkprintunixdialog.ui.h b/gtk/ui/gtkprintunixdialog.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkprintunixdialog.ui.h
rename to gtk/ui/gtkprintunixdialog.ui.h
diff --git a/gtk/resources/ui/gtkrecentchooserdefault.ui b/gtk/ui/gtkrecentchooserdefault.ui
similarity index 100%
rename from gtk/resources/ui/gtkrecentchooserdefault.ui
rename to gtk/ui/gtkrecentchooserdefault.ui
diff --git a/gtk/resources/ui/gtkrecentchooserdefault.ui.h b/gtk/ui/gtkrecentchooserdefault.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkrecentchooserdefault.ui.h
rename to gtk/ui/gtkrecentchooserdefault.ui.h
diff --git a/gtk/resources/ui/gtkscalebutton.ui b/gtk/ui/gtkscalebutton.ui
similarity index 100%
rename from gtk/resources/ui/gtkscalebutton.ui
rename to gtk/ui/gtkscalebutton.ui
diff --git a/gtk/resources/ui/gtkscalebutton.ui.h b/gtk/ui/gtkscalebutton.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkscalebutton.ui.h
rename to gtk/ui/gtkscalebutton.ui.h
diff --git a/gtk/resources/ui/gtksearchbar.ui b/gtk/ui/gtksearchbar.ui
similarity index 100%
rename from gtk/resources/ui/gtksearchbar.ui
rename to gtk/ui/gtksearchbar.ui
diff --git a/gtk/resources/ui/gtksearchbar.ui.h b/gtk/ui/gtksearchbar.ui.h
similarity index 100%
rename from gtk/resources/ui/gtksearchbar.ui.h
rename to gtk/ui/gtksearchbar.ui.h
diff --git a/gtk/resources/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui
similarity index 100%
rename from gtk/resources/ui/gtkstatusbar.ui
rename to gtk/ui/gtkstatusbar.ui
diff --git a/gtk/resources/ui/gtkstatusbar.ui.h b/gtk/ui/gtkstatusbar.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkstatusbar.ui.h
rename to gtk/ui/gtkstatusbar.ui.h
diff --git a/gtk/resources/ui/gtkvolumebutton.ui b/gtk/ui/gtkvolumebutton.ui
similarity index 100%
rename from gtk/resources/ui/gtkvolumebutton.ui
rename to gtk/ui/gtkvolumebutton.ui
diff --git a/gtk/resources/ui/gtkvolumebutton.ui.h b/gtk/ui/gtkvolumebutton.ui.h
similarity index 100%
rename from gtk/resources/ui/gtkvolumebutton.ui.h
rename to gtk/ui/gtkvolumebutton.ui.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1fb727b..3f43208 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -331,27 +331,27 @@ modules/printbackends/file/gtkprintbackendfile.c
 modules/printbackends/lpr/gtkprintbackendlpr.c
 modules/printbackends/papi/gtkprintbackendpapi.c
 modules/printbackends/test/gtkprintbackendtest.c
-gtk/resources/ui/gtkaboutdialog.ui.h
-gtk/resources/ui/gtkappchooserdialog.ui.h
-gtk/resources/ui/gtkappchooserwidget.ui.h
-gtk/resources/ui/gtkapplication-quartz.ui.h
-gtk/resources/ui/gtkassistant.ui.h
-gtk/resources/ui/gtkcolorchooserdialog.ui.h
-gtk/resources/ui/gtkcoloreditor.ui.h
-gtk/resources/ui/gtkdialog.ui.h
-gtk/resources/ui/gtkfilechooserbutton.ui.h
-gtk/resources/ui/gtkfilechooserdialog.ui.h
-gtk/resources/ui/gtkfilechooserwidget.ui.h
-gtk/resources/ui/gtkfontbutton.ui.h
-gtk/resources/ui/gtkfontchooserdialog.ui.h
-gtk/resources/ui/gtkfontchooserwidget.ui.h
-gtk/resources/ui/gtkinfobar.ui.h
-gtk/resources/ui/gtklockbutton.ui.h
-gtk/resources/ui/gtkmessagedialog.ui.h
-gtk/resources/ui/gtkpagesetupunixdialog.ui.h
-gtk/resources/ui/gtkpathbar.ui.h
-gtk/resources/ui/gtkprintunixdialog.ui.h
-gtk/resources/ui/gtkrecentchooserdefault.ui.h
-gtk/resources/ui/gtkscalebutton.ui.h
-gtk/resources/ui/gtkstatusbar.ui.h
-gtk/resources/ui/gtkvolumebutton.ui.h
+gtk/ui/gtkaboutdialog.ui.h
+gtk/ui/gtkappchooserdialog.ui.h
+gtk/ui/gtkappchooserwidget.ui.h
+gtk/ui/gtkapplication-quartz.ui.h
+gtk/ui/gtkassistant.ui.h
+gtk/ui/gtkcolorchooserdialog.ui.h
+gtk/ui/gtkcoloreditor.ui.h
+gtk/ui/gtkdialog.ui.h
+gtk/ui/gtkfilechooserbutton.ui.h
+gtk/ui/gtkfilechooserdialog.ui.h
+gtk/ui/gtkfilechooserwidget.ui.h
+gtk/ui/gtkfontbutton.ui.h
+gtk/ui/gtkfontchooserdialog.ui.h
+gtk/ui/gtkfontchooserwidget.ui.h
+gtk/ui/gtkinfobar.ui.h
+gtk/ui/gtklockbutton.ui.h
+gtk/ui/gtkmessagedialog.ui.h
+gtk/ui/gtkpagesetupunixdialog.ui.h
+gtk/ui/gtkpathbar.ui.h
+gtk/ui/gtkprintunixdialog.ui.h
+gtk/ui/gtkrecentchooserdefault.ui.h
+gtk/ui/gtkscalebutton.ui.h
+gtk/ui/gtkstatusbar.ui.h
+gtk/ui/gtkvolumebutton.ui.h
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 8c54683..e0cdd68 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -72,30 +72,30 @@ gtk/inspector/style-prop-list.ui
 gtk/inspector/visual.ui
 gtk/inspector/window.ui
 gtk/paper_names.c
-gtk/resources/ui/gtkaboutdialog.ui
-gtk/resources/ui/gtkappchooserdialog.ui
-gtk/resources/ui/gtkappchooserwidget.ui
-gtk/resources/ui/gtkapplication-quartz.ui
-gtk/resources/ui/gtkassistant.ui
-gtk/resources/ui/gtkcolorchooserdialog.ui
-gtk/resources/ui/gtkcoloreditor.ui
-gtk/resources/ui/gtkdialog.ui
-gtk/resources/ui/gtkfilechooserbutton.ui
-gtk/resources/ui/gtkfilechooserdialog.ui
-gtk/resources/ui/gtkfilechooserwidget.ui
-gtk/resources/ui/gtkfontbutton.ui
-gtk/resources/ui/gtkfontchooserdialog.ui
-gtk/resources/ui/gtkfontchooserwidget.ui
-gtk/resources/ui/gtkinfobar.ui
-gtk/resources/ui/gtklockbutton.ui
-gtk/resources/ui/gtkmessagedialog.ui
-gtk/resources/ui/gtkpagesetupunixdialog.ui
-gtk/resources/ui/gtkpathbar.ui
-gtk/resources/ui/gtkprintunixdialog.ui
-gtk/resources/ui/gtkrecentchooserdefault.ui
-gtk/resources/ui/gtkscalebutton.ui
-gtk/resources/ui/gtkstatusbar.ui
-gtk/resources/ui/gtkvolumebutton.ui
+gtk/ui/gtkaboutdialog.ui
+gtk/ui/gtkappchooserdialog.ui
+gtk/ui/gtkappchooserwidget.ui
+gtk/ui/gtkapplication-quartz.ui
+gtk/ui/gtkassistant.ui
+gtk/ui/gtkcolorchooserdialog.ui
+gtk/ui/gtkcoloreditor.ui
+gtk/ui/gtkdialog.ui
+gtk/ui/gtkfilechooserbutton.ui
+gtk/ui/gtkfilechooserdialog.ui
+gtk/ui/gtkfilechooserwidget.ui
+gtk/ui/gtkfontbutton.ui
+gtk/ui/gtkfontchooserdialog.ui
+gtk/ui/gtkfontchooserwidget.ui
+gtk/ui/gtkinfobar.ui
+gtk/ui/gtklockbutton.ui
+gtk/ui/gtkmessagedialog.ui
+gtk/ui/gtkpagesetupunixdialog.ui
+gtk/ui/gtkpathbar.ui
+gtk/ui/gtkprintunixdialog.ui
+gtk/ui/gtkrecentchooserdefault.ui
+gtk/ui/gtkscalebutton.ui
+gtk/ui/gtkstatusbar.ui
+gtk/ui/gtkvolumebutton.ui
 tests/dialog.ui
 tests/testfilechooser.c
 testsuite/a11y/accessible-name.ui


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]