Merge lp:~arayaq/pantheon-terminal/fix-1351898 into lp:~elementary-apps/pantheon-terminal/trunk

[Angel Araya]

Don't restore tabs with nonexistent paths (lp:1351898)

When restoring the tabs checks which paths does exist and add them, the rest goes omitted. If all the paths are nonexistent creates a single tab at HOME.

[Akshay Shekher (voldyman)]

Good work Araya.
You should change the code style (placement of `{`) to the elementary
coding standard. It can be found on the website, opening braces are not on
a new line etc.
On Aug 20, 2014 8:42 AM, "Angel Araya" <email address hidden> wrote:

> Angel Araya has proposed merging lp:~arayaq/pantheon-terminal/fix-1351898
> into lp:pantheon-terminal.
>
> Requested reviews:
> elementary Apps team (elementary-apps)
>
> For more details, see:
>
> https://code.launchpad.net/~arayaq/pantheon-terminal/fix-1351898/+merge/231493
>
> When restoring the tabs checks which paths does exist and add them, the
> rest goes omitted. If all the paths are nonexistent creates a single tab at
> HOME.
> --
>
> https://code.launchpad.net/~arayaq/pantheon-terminal/fix-1351898/+merge/231493
> Your team elementary Apps team is requested to review the proposed merge
> of lp:~arayaq/pantheon-terminal/fix-1351898 into lp:pantheon-terminal.
>
> === modified file 'src/PantheonTerminalWindow.vala'
> --- src/PantheonTerminalWindow.vala 2014-08-09 17:05:43 +0000
> +++ src/PantheonTerminalWindow.vala 2014-08-20 03:11:15 +0000
> @@ -407,8 +407,35 @@
> if (tabs.length == 0) {
> new_tab ();
> } else {
> - foreach (string loc in tabs) {
> - new_tab (loc);
> +
> + /* Check wether the dir exists (LP #1351898) */
> + int null_dirs = 0;
> + for (int i = 0; i < tabs.length; i++)
> + {
> + File file = File.new_for_path (tabs[i]);
> + if (file.query_exists () == false)
> + {
> + null_dirs++;
> + tabs[i] = "";
> + }
> +
> + if (null_dirs == tabs.length)
> + {
> + tabs[0] = "~";
> + }
> + }
> +
> + foreach (string loc in tabs)
> + {
> +
> + if (loc == "")
> + {
> + continue;
> + }
> + else
> + {
> + new_tab (loc);
> + }
> }
> }
> } else {
>
>
>

[lp:~arayaq/pantheon-terminal/fix-1351898]

615. By Angel Araya on 2014-08-20

Fixed code style

[David Gomes (davidgomes)]

Remove diff line number 29 as well as the Launchpad reference on that comment.

review: Needs Fixing

[lp:~arayaq/pantheon-terminal/fix-1351898]

616. By Angel Araya on 2014-08-20

More code style fixing

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2014-08-09 17:05:43 +0000
+++ src/PantheonTerminalWindow.vala	2014-08-20 14:43:39 +0000
@@ -407,8 +407,27 @@
                 if (tabs.length == 0) {
                     new_tab ();
                 } else {
+                    
+                    int null_dirs = 0;
+                    for (int i = 0; i < tabs.length; i++) {
+                        File file = File.new_for_path (tabs[i]);
+
+                        if (file.query_exists () == false) {
+                            null_dirs++;
+                            tabs[i] = "";
+                        }
+
+                        if (null_dirs == tabs.length) {
+                            tabs[0] = "~";
+                        }
+                    }
+
                     foreach (string loc in tabs) {
-                        new_tab (loc);
+
+                        if (loc == "")
+                            continue;
+                        else 
+                            new_tab (loc);        
                     }
                 }
             } else {