[gnome-power-manager: 3/3] Merge branch 'icon-name-spec'

[Richard Hughes <rhughes src gnome org>]

commit 58910a205d3da3672a32a59ee1bec6856819a36a
Merge: 09fa88e 5525891
Author: Richard Hughes <richard hughsie com>
Date:   Fri Apr 30 13:56:31 2010 +0100

    Merge branch 'icon-name-spec'

 data/icons/16x16/status/Makefile.am                |   25 +-
 ...0-charging.png => battery-caution-charging.png} |  Bin 800 -> 800 bytes
 .../{gpm-battery-000.png => battery-caution.png}   |  Bin 567 -> 567 bytes
 .../{gpm-battery-empty.png => battery-empty.png}   |  Bin 501 -> 501 bytes
 ...-100-charging.png => battery-full-charging.png} |  Bin 818 -> 818 bytes
 .../{gpm-battery-100.png => battery-full.png}      |  Bin 591 -> 591 bytes
 ...-060-charging.png => battery-good-charging.png} |  Bin 804 -> 804 bytes
 .../{gpm-battery-060.png => battery-good.png}      |  Bin 595 -> 595 bytes
 ...y-020-charging.png => battery-low-charging.png} |  Bin 804 -> 804 bytes
 .../{gpm-battery-020.png => battery-low.png}       |  Bin 600 -> 600 bytes
 ...gpm-battery-missing.png => battery-missing.png} |  Bin 603 -> 603 bytes
 .../16x16/status/gpm-battery-040-charging.png      |  Bin 814 -> 0 bytes
 data/icons/16x16/status/gpm-battery-040.png        |  Bin 635 -> 0 bytes
 .../16x16/status/gpm-battery-080-charging.png      |  Bin 808 -> 0 bytes
 data/icons/16x16/status/gpm-battery-080.png        |  Bin 607 -> 0 bytes
 data/icons/16x16/status/gpm-battery-charged.png    |  Bin 754 -> 0 bytes
 data/icons/22x22/status/Makefile.am                |   25 +-
 ...0-charging.png => battery-caution-charging.png} |  Bin 1132 -> 1132 bytes
 .../{gpm-battery-000.png => battery-caution.png}   |  Bin 717 -> 717 bytes
 .../{gpm-battery-empty.png => battery-empty.png}   |  Bin 641 -> 641 bytes
 ...-100-charging.png => battery-full-charging.png} |  Bin 1131 -> 1131 bytes
 .../{gpm-battery-100.png => battery-full.png}      |  Bin 721 -> 721 bytes
 ...-060-charging.png => battery-good-charging.png} |  Bin 1138 -> 1138 bytes
 .../{gpm-battery-060.png => battery-good.png}      |  Bin 752 -> 752 bytes
 ...y-020-charging.png => battery-low-charging.png} |  Bin 1135 -> 1135 bytes
 .../{gpm-battery-020.png => battery-low.png}       |  Bin 715 -> 715 bytes
 ...gpm-battery-missing.png => battery-missing.png} |  Bin 799 -> 799 bytes
 .../22x22/status/gpm-battery-040-charging.png      |  Bin 1126 -> 0 bytes
 data/icons/22x22/status/gpm-battery-040.png        |  Bin 747 -> 0 bytes
 .../22x22/status/gpm-battery-080-charging.png      |  Bin 1149 -> 0 bytes
 data/icons/22x22/status/gpm-battery-080.png        |  Bin 751 -> 0 bytes
 data/icons/22x22/status/gpm-battery-charged.png    |  Bin 1053 -> 0 bytes
 data/icons/24x24/status/Makefile.am                |   25 +-
 ...0-charging.png => battery-caution-charging.png} |  Bin 1152 -> 1152 bytes
 .../{gpm-battery-000.png => battery-caution.png}   |  Bin 747 -> 747 bytes
 .../{gpm-battery-empty.png => battery-empty.png}   |  Bin 669 -> 669 bytes
 ...-100-charging.png => battery-full-charging.png} |  Bin 1155 -> 1155 bytes
 .../{gpm-battery-100.png => battery-full.png}      |  Bin 749 -> 749 bytes
 ...-060-charging.png => battery-good-charging.png} |  Bin 1162 -> 1162 bytes
 .../{gpm-battery-060.png => battery-good.png}      |  Bin 783 -> 783 bytes
 ...y-020-charging.png => battery-low-charging.png} |  Bin 1151 -> 1151 bytes
 .../{gpm-battery-020.png => battery-low.png}       |  Bin 751 -> 751 bytes
 ...gpm-battery-missing.png => battery-missing.png} |  Bin 833 -> 833 bytes
 .../24x24/status/gpm-battery-040-charging.png      |  Bin 1153 -> 0 bytes
 data/icons/24x24/status/gpm-battery-040.png        |  Bin 778 -> 0 bytes
 .../24x24/status/gpm-battery-080-charging.png      |  Bin 1174 -> 0 bytes
 data/icons/24x24/status/gpm-battery-080.png        |  Bin 783 -> 0 bytes
 data/icons/24x24/status/gpm-battery-charged.png    |  Bin 1121 -> 0 bytes
 data/icons/32x32/status/Makefile.am                |   25 +-
 ...0-charging.png => battery-caution-charging.png} |  Bin 2388 -> 2388 bytes
 .../{gpm-battery-000.png => battery-caution.png}   |  Bin 1485 -> 1485 bytes
 .../{gpm-battery-empty.png => battery-empty.png}   |  Bin 1311 -> 1311 bytes
 ...-100-charging.png => battery-full-charging.png} |  Bin 2364 -> 2364 bytes
 .../{gpm-battery-100.png => battery-full.png}      |  Bin 1311 -> 1311 bytes
 ...-060-charging.png => battery-good-charging.png} |  Bin 2475 -> 2475 bytes
 .../{gpm-battery-060.png => battery-good.png}      |  Bin 1509 -> 1509 bytes
 ...y-020-charging.png => battery-low-charging.png} |  Bin 2438 -> 2438 bytes
 .../{gpm-battery-020.png => battery-low.png}       |  Bin 1516 -> 1516 bytes
 ...gpm-battery-missing.png => battery-missing.png} |  Bin 1662 -> 1662 bytes
 .../32x32/status/gpm-battery-040-charging.png      |  Bin 2461 -> 0 bytes
 data/icons/32x32/status/gpm-battery-040.png        |  Bin 1522 -> 0 bytes
 .../32x32/status/gpm-battery-080-charging.png      |  Bin 2471 -> 0 bytes
 data/icons/32x32/status/gpm-battery-080.png        |  Bin 1441 -> 0 bytes
 data/icons/32x32/status/gpm-battery-charged.png    |  Bin 2257 -> 0 bytes
 data/icons/48x48/status/Makefile.am                |   25 +-
 ...0-charging.png => battery-caution-charging.png} |  Bin 4134 -> 4134 bytes
 .../{gpm-battery-000.png => battery-caution.png}   |  Bin 2419 -> 2419 bytes
 .../{gpm-battery-empty.png => battery-empty.png}   |  Bin 2129 -> 2129 bytes
 ...-100-charging.png => battery-full-charging.png} |  Bin 4055 -> 4055 bytes
 .../{gpm-battery-100.png => battery-full.png}      |  Bin 2244 -> 2244 bytes
 ...-060-charging.png => battery-good-charging.png} |  Bin 4169 -> 4169 bytes
 .../{gpm-battery-060.png => battery-good.png}      |  Bin 2484 -> 2484 bytes
 ...y-020-charging.png => battery-low-charging.png} |  Bin 4155 -> 4155 bytes
 .../{gpm-battery-020.png => battery-low.png}       |  Bin 2493 -> 2493 bytes
 ...gpm-battery-missing.png => battery-missing.png} |  Bin 2258 -> 2258 bytes
 .../48x48/status/gpm-battery-040-charging.png      |  Bin 4189 -> 0 bytes
 data/icons/48x48/status/gpm-battery-040.png        |  Bin 2544 -> 0 bytes
 .../48x48/status/gpm-battery-080-charging.png      |  Bin 4245 -> 0 bytes
 data/icons/48x48/status/gpm-battery-080.png        |  Bin 2452 -> 0 bytes
 data/icons/48x48/status/gpm-battery-charged.png    |  Bin 3712 -> 0 bytes
 data/icons/scalable/status/Makefile.am             |   25 +-
 ...0-charging.svg => battery-caution-charging.svg} |    0
 .../{gpm-battery-000.svg => battery-caution.svg}   |    0
 .../{gpm-battery-empty.svg => battery-empty.svg}   |    4 +-
 ...-100-charging.svg => battery-full-charging.svg} |    0
 .../{gpm-battery-100.svg => battery-full.svg}      |    0
 ...-060-charging.svg => battery-good-charging.svg} |    0
 .../{gpm-battery-060.svg => battery-good.svg}      |    0
 ...y-020-charging.svg => battery-low-charging.svg} |    0
 .../{gpm-battery-020.svg => battery-low.svg}       |    0
 ...gpm-battery-missing.svg => battery-missing.svg} |    0
 .../scalable/status/gpm-battery-040-charging.svg   |  504 ---------------
 data/icons/scalable/status/gpm-battery-040.svg     |  279 --------
 .../scalable/status/gpm-battery-080-charging.svg   |  504 ---------------
 data/icons/scalable/status/gpm-battery-080.svg     |  279 --------
 data/icons/scalable/status/gpm-battery-charged.svg |  673 --------------------
 src/gpm-upower.c                                   |   84 ++--
 97 files changed, 107 insertions(+), 2370 deletions(-)
---