Merge lp://staging/~elementary-apps/switchboard/cleanup into lp://staging/~elementary-pantheon/switchboard/switchboard

Code style

Diff lines 244-245, 262, 265, 310, 445: Put the blocks of code in separate lines from the "try" and "catch" statements:

try {
    //...
} catch (Error e) {
    //...
}

Diff line 303: A space after "else if" and before the parenthesis.

Diff line 320: A space on the other side of the parenthesis :)

Diff line 380: A space before the opening parenthesis.

Diff line 450: A space after the opening curly brace.

I would offer to submit the changes myself (since I'm in ~elementary-apps too) but I am not able to compile this on Luna (GTK >= 3.6 required).

Junrrein, I fixed the stuff. Care to re-review?

Re-indent diff lines 150, 153, 163-164, 391, they are part of foreach blocks.

You can close lines 163-164 in curly braces for clarity.

Diff line 225: Move the warning to its own line.

Diff line 373: Space after get_file_type.

Diff line 475: Space after search_box_activated.

I see you also fixed stuff I didn't catch, nice!

It's ready to go.

Good work Raphael and Munchor!

Rejecting this branch because there are major changes coming to Switchboard (see https://code.launchpad.net/~elementary-apps/switchboard/libpeas-isis/+merge/195417).

We should review that branch for code style later instead.