Merge lp:~superscript18/scratch/bugfix-1397103 into lp:~elementary-apps/scratch/scratch

Proposed by SuperScript
Status: Merged
Approved by: Artem Anufrij
Approved revision: 1419
Merged at revision: 1418
Proposed branch: lp:~superscript18/scratch/bugfix-1397103
Merge into: lp:~elementary-apps/scratch/scratch
Diff against target: 20 lines (+3/-2)
1 file modified
src/Widgets/SplitView.vala (+3/-2)
To merge this branch: bzr merge lp:~superscript18/scratch/bugfix-1397103
Reviewer Review Type Date Requested Status
Artem Anufrij (community) Approve
Review via email: mp+243118@code.launchpad.net

Commit message

Drop a file on the welcome screen opens it instantly.

Description of the change

Made the adding of a new view non-optional in the welcome screen drag'n'drop handler.

To post a comment you must log in.
1419. By SuperScript

Fixes bug #139103, not #139104

Revision history for this message
Artem Anufrij (artem-anufrij) wrote :

Works as expected.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/SplitView.vala'
2--- src/Widgets/SplitView.vala 2014-10-26 08:26:36 +0000
3+++ src/Widgets/SplitView.vala 2014-11-28 07:19:58 +0000
4@@ -71,7 +71,7 @@
5 this.welcome_screen.drag_data_received.connect ((ctx, x, y, sel, info, time) => {
6 var uris = sel.get_uris ();
7 if (uris.length > 0) {
8- var view = this.current_view ?? this.add_view ();
9+ var view = this.add_view ();
10
11 for (var i = 0; i < uris.length; i++) {
12 string filename = uris[i];
13@@ -201,4 +201,5 @@
14 window.main_actions.get_action ("RemoveView").sensitive = (views.length () > 1);
15 }
16 }
17-}
18\ No newline at end of file
19+}
20+

Subscribers

People subscribed via source and target branches