Replaces a deprecated constant with an allowed one; fixes #6891.
Merge branch 'master' of git://yorba.org/shotwell