Merge lp://qastaging/~computergeoffrey/pantheon-photos/master into lp://qastaging/~pantheon-photos/pantheon-photos/trunk

Simply add the new condition at first position of the exiting if-clause. So no need for an additional if-wrapper, therefore you get a *two-line* change

Done.

Not sure if I should change the status back to Resubmit.

Squash this into one commit!

Fix the codestyle and actually look at the diff of this merge. So don't touch the other lines.

How would I do that?

What's wrong with the codestyle? I just don't understand what's wrong. Also, I haven't touched the other lines?

I merged this with the help of matzipan and donadigo. Looks good to me. I didn't know you used spaces instead of tabs, but now I do.

What you actually want is:

Photo? photo = (get_view ().get_selected_at (0).get_source () as Photo);
if (photo != null && photo.get_master_file_format () == PhotoFileFormat.RAW) {
}

Tested. Should be fine.

Hey Geoffrey,

Make sure to set a commit message for your merge request (somewhere above "Description of the Change"). Once you set that, it will take 20 minutes and it will be merged automatically.

Done.