upower-1.0 changes

More upower-1.0 changes