Merge lp:~teemperor/pantheon-terminal/fix-1353010-comma-in-paths into lp:~elementary-apps/pantheon-terminal/trunk

[Raphael Isemann]

Fixes remember-tabs setting, changes the type of dconf-key to a string-array.

We change the type of the dconf-key to a string-array.

Code stays 1 to 1 like the previous code, this is just about fixing the bug.

Codecleanup will be a different merge-request.

[Niclas Lockner (niclasl)]

The value of the remember-tabs dconf key isn't respected. Saved tabs are restored even if remember-tabs is false.

The branch fixes the related bug though.

review: Needs Fixing

[lp:~teemperor/pantheon-terminal/fix-1353010-comma-in-paths]

594. By Raphael Isemann on 2014-08-07

We are now respecting the remember-tabs setting

[Raphael Isemann (teemperor)]

Thanks for the review, it should work now.

review: Needs Resubmitting

[Raphael Isemann (teemperor)]

Oh wait, didn't wanted to review with resubmit...

[David Gomes (davidgomes)]

review: Approve

[David Gomes (davidgomes)]

review: Approve

=== modified file 'org.pantheon.terminal.gschema.xml'
--- org.pantheon.terminal.gschema.xml	2014-04-29 12:59:41 +0000
+++ org.pantheon.terminal.gschema.xml	2014-08-07 08:59:07 +0000
@@ -34,8 +34,8 @@
       <summary>The saved state of the window.</summary>
       <description>The saved state of the window.</description>
     </key>
-    <key name="tabs" type="s">
-      <default>""</default>
+    <key name="tabs" type="as">
+      <default>[]</default>
       <summary>List of tabs which were active when the window was closed</summary>
       <description>List of tabs which were active when the window was closed</description>
     </key>

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2014-08-05 23:02:15 +0000
+++ src/PantheonTerminalWindow.vala	2014-08-07 08:59:07 +0000
@@ -38,7 +38,7 @@
 
         public TerminalWidget current_terminal = null;
         private bool is_fullscreen = false;
-        private string saved_tabs;
+        private string[] saved_tabs;
 
         const string ui_string = """
             <ui>
@@ -275,7 +275,7 @@
             saved_state.window_width = settings.window_width;
             saved_state.opening_x = -1;
             saved_state.opening_y = -1;
-            saved_state.tabs = "";
+            saved_state.tabs = {};
         }
 
         private void on_tab_added (Granite.Widgets.Tab tab) {
@@ -399,7 +399,7 @@
         }
 
         private void reset_saved_tabs () {
-            saved_state.tabs = "";
+            saved_state.tabs = {};
         }
 
         private void on_switch_page (Granite.Widgets.Tab? old,
@@ -411,16 +411,19 @@
         }
 
         private void open_tabs () {
-            string tabs = saved_tabs;
-            if (tabs == "" || !settings.remember_tabs ||
-                tabs.replace (",", " ").strip () == "") {
-                new_tab ();
-            } else {
-                foreach (string loc in tabs.split (",")) {
-                    if (loc != "")
+            string[] tabs = saved_tabs;
+            if (settings.remember_tabs) {
+                if (tabs.length == 0) {
+                    new_tab ();
+                } else {
+                    foreach (string loc in tabs) {
                         new_tab (loc);
+                    }
                 }
+            } else {
+                new_tab ("");
             }
+
         }
 
         private void new_tab (string directory="", string? program=null) {
@@ -523,12 +526,12 @@
         protected override bool delete_event (Gdk.EventAny event) {
             update_saved_window_state ();
             action_quit ();
-            string tabs = "";
+            string[] tabs = {};
             var tabs_to_terminate = new GLib.List <TerminalWidget> ();
 
             foreach (var t in terminals) {
                 t = (TerminalWidget) t;
-                tabs += t.get_shell_location () + ",";
+                tabs += t.get_shell_location ();
                 if (t.has_foreground_process ()) {
                     var d = new ForegroundProcessDialog.before_close ();
                     if (d.run () == 1) {
@@ -675,4 +678,4 @@
               action_fullscreen }
         };
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2014-07-03 23:20:40 +0000
+++ src/Settings.vala	2014-08-07 08:59:07 +0000
@@ -40,7 +40,7 @@
         public int window_width { get; set; }
         public int window_height { get; set; }
         public PantheonTerminalWindowState window_state { get; set; }
-        public string tabs { get; set; }
+        public string[] tabs { get; set; }
         public int opening_x { get; set; }
         public int opening_y { get; set; }
 
@@ -77,4 +77,4 @@
             base ("org.pantheon.terminal.settings");
         }
     }
-}
+}
\ No newline at end of file