Merge lp:~voldyman/pantheon-terminal/special-chars-working-dir into lp:~elementary-apps/pantheon-terminal/trunk

[Akshay Shekher]

Fixes -w on paths with special characters.

[David Gomes (davidgomes)]

review: Approve

=== modified file 'src/PantheonTerminal.vala'
--- src/PantheonTerminal.vala	2014-10-03 17:31:43 +0000
+++ src/PantheonTerminal.vala	2014-12-27 20:43:27 +0000
@@ -74,7 +74,7 @@
         }
 
         public void new_window () {
-            new PantheonTerminalWindow (this);
+            new PantheonTerminalWindow (this).present ();
         }
 
         public PantheonTerminalWindow new_window_with_coords (int x, int y, bool should_recreate_tabs=true) {
@@ -155,12 +155,19 @@
                 return 0;
             }
 
-            if (command_e != null)
+            if (command_e != null) {
                 run_commands (command_e);
-            else if (working_directory != null)
+
+            } else if (working_directory != null) {
                 start_terminal_with_working_directory (working_directory);
-            else
+
+            } else if (print_version) {
+                stdout.printf ("Pantheon Terminal %s\n", Build.VERSION);
+                stdout.printf ("Copyright 2011-2014 Pantheon Terminal Developers.\n");
+
+            } else {
                 new_window ();
+            }
 
             // Do not save the value until the next instance of
             // Pantheon Terminal is started
@@ -203,34 +210,13 @@
             { "version", 'v', 0, OptionArg.NONE, out print_version, N_("Print version info and exit"), null },
             { "about", 'a', 0, OptionArg.NONE, out show_about_dialog, N_("Show about dialog"), null },
             { "execute" , 'e', 0, OptionArg.STRING_ARRAY, ref command_e, N_("Run a program in terminal"), "" },
-            { "working-directory", 'w', 0, OptionArg.STRING, ref working_directory, N_("Set shell working directory"), "" },
+            { "working-directory", 'w', 0, OptionArg.FILENAME, ref working_directory, N_("Set shell working directory"), "" },
             { null }
         };
 
         public static int main (string[] args) {
-            var context = new OptionContext ("Terminal");
-            context.add_main_entries (entries, Build.GETTEXT_PACKAGE);
-
-            string[] args_primary_instance = args;
-
-            try {
-                context.parse(ref args);
-            } catch (Error e) {
-                error (e.message);
-            }
-
-            if (print_version) {
-                stdout.printf ("Pantheon Terminal %s\n", Build.VERSION);
-                stdout.printf ("Copyright 2011-2014 Pantheon Terminal Developers.\n");
-
-                return 0;
-            }
-
-            Gtk.init (ref args);
-            Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
-
             var app = new PantheonTerminalApp ();
-            return app.run (args_primary_instance);
+            return app.run (args);
         }
     }
 } // Namespace

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2014-12-06 15:09:22 +0000
+++ src/PantheonTerminalWindow.vala	2014-12-27 20:43:27 +0000
@@ -101,6 +101,8 @@
             icon_name = "utilities-terminal";
             set_application (app);
 
+            Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
+
             Notify.init (app.program_name);
             set_visual (Gdk.Screen.get_default ().get_rgba_visual ());