Merge lp:~kjtehprogrammer/scratch/fix-1312496 into lp:~elementary-apps/scratch/scratch

Proposed by KJ Lawrence
Status: Merged
Approved by: Mario Guerriero
Approved revision: 1292
Merged at revision: 1294
Proposed branch: lp:~kjtehprogrammer/scratch/fix-1312496
Merge into: lp:~elementary-apps/scratch/scratch
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/outline/CtagsSymbolResolver.vala (+1/-1)
To merge this branch: bzr merge lp:~kjtehprogrammer/scratch/fix-1312496
Reviewer Review Type Date Requested Status
Mario Guerriero (community) Approve
Review via email: mp+217166@code.launchpad.net

Commit message

Description of the change

Array was too short

To post a comment you must log in.
Revision history for this message
Mario Guerriero (mefrio-g) wrote :

It seems to be good but I would wait the merge of my other branch about outline plugin before merging this one.

Here is my branch: https://code.launchpad.net/~mefrio-g/scratch/fix-1258260

Revision history for this message
KJ Lawrence (kjtehprogrammer) wrote :

No problem - I subscribed to yours. I'll merge the changes into my branch once yours goes through if I need to.

1292. By KJ Lawrence

Merge with trunk

Revision history for this message
KJ Lawrence (kjtehprogrammer) wrote :

Merged trunk into this branch

Revision history for this message
Mario Guerriero (mefrio-g) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/outline/CtagsSymbolResolver.vala'
2--- plugins/outline/CtagsSymbolResolver.vala 2014-04-23 16:13:44 +0000
3+++ plugins/outline/CtagsSymbolResolver.vala 2014-04-27 02:04:07 +0000
4@@ -90,7 +90,7 @@
5 var type = parts[3];
6 int line = 0;
7 string? parent = null;
8- parse_fields (string.joinv (" ", parts[4:parts.length - 1]), out line, out parent);
9+ parse_fields (string.joinv (" ", parts[4:parts.length]), out line, out parent);
10
11 Icon? icon = null;
12 switch (type) {

Subscribers

People subscribed via source and target branches