Merge lp:~tombeckmann/switchboard/cli-open-fixes into lp:~elementary-pantheon/switchboard/switchboard
Status: | Merged |
---|---|
Approved by: | Cody Garver |
Approved revision: | 462 |
Merged at revision: | 459 |
Proposed branch: | lp:~tombeckmann/switchboard/cli-open-fixes |
Merge into: | lp:~elementary-pantheon/switchboard/switchboard |
Diff against target: |
102 lines (+46/-3) 2 files modified
CMakeLists.txt (+3/-1) src/Switchboard.vala (+43/-2) |
To merge this branch: | bzr merge lp:~tombeckmann/switchboard/cli-open-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Corentin Noël | Approve | ||
Sergey "Shnatsel" Davidoff (community) | Abstain | ||
Review via email: mp+225763@code.launchpad.net |
Commit message
Initialize cheese-gtk before gtk, required for GNOME Control Center compatibility layer
Description of the change
This fixes the crash when opening a gcc plug via commandline, it was caused by the user-accounts plug requiring cheese-gtk to be initialized before gtk. We fix this by initializing cheese-gtk for it. A different solution would have been to have all plugins initialize themselves when switchboard starts, but this approach appears easier and better for performance.
The branch also introduces a translation from gcc plug names to switchboard plug names. The names are taken directly from gcc's source, so they are definitely correct and we can easily swap out our plugs if we replace gcc ones. As shnatsel already mentioned here https:/
The gnome-control-
Oups, accidentally moved the translate function in the HAVE_UNITY conditional block. Will fix that once I get back to my computer in around 8h.