Merge lp:~garrettdreyfus/scratch/encode-fix into lp:~elementary-apps/scratch/scratch
Proposed by
Garrett
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Mario Guerriero | ||||
Approved revision: | 1258 | ||||
Merged at revision: | 1261 | ||||
Proposed branch: | lp:~garrettdreyfus/scratch/encode-fix | ||||
Merge into: | lp:~elementary-apps/scratch/scratch | ||||
Diff against target: |
78 lines (+23/-11) 1 file modified
src/Services/Encoding.vala (+23/-11) |
||||
To merge this branch: | bzr merge lp:~garrettdreyfus/scratch/encode-fix | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mario Guerriero (community) | Approve | ||
Review via email: mp+210939@code.launchpad.net |
Commit message
Use ConverterInputS
Description of the change
This patch should fix this bug https:/
To post a comment you must log in.
Some comments on formatting the code:
Line 302 -> Needs a space behind the )
Otherwise: Use 4 spaces instead of Tabs. Look at the settings in Scratch (Gear on the upper right): There is a switch for turning a tab automatically into 4 spaces. There is also a switch for showing whitespace- characters which helps you to see where you did formatting errors. You never need to use tabs when you code with the styleguide of elementary. You can also activate the addon which automatically strips whitespace from the end of a line. That's already wrong in that sourcefile so you could also fix that in the same merge-request :)
Here is the styleguide for further reading: http:// elementaryos. org/docs/ code/code- style
When you corrected your branch you can just push your new commit to the branch and this merge-requests gets updated ;)