Merge lp:~voldyman/pantheon-terminal/opt-e-fix into lp:~elementary-apps/pantheon-terminal/trunk

[Akshay Shekher]

the old implementation of terminal caused an error, when the terminal was running and another terminal was launched using any parameter, terminal ignored it but this branch fixes that.

[David Gomes (davidgomes)]

It didn't work for me. I merged, built and installed. I launched pantheon-terminal.

From inside pantheon-terminal I ran "pantheon-terminal -e chromium" and it didn't work. So, without an already-opened instance, I tried (from another terminal emulator) the same thing and it didn't work either.

So I re-branched pantheon-terminal from trunk and tried "pantheon-terminal -e chromium" from another terminal emulator and it also didn't work.

Very, very strange behavior, I remember this working perfectly.

[Raphael Isemann (teemperor)]

Fix works here. Feel free to merge it.

review: Approve

[David Gomes (davidgomes)]

Sorry that it took so long, but only now did I manage to test it.

review: Approve

=== modified file 'src/PantheonTerminal.vala'
--- src/PantheonTerminal.vala	2013-03-04 17:26:46 +0000
+++ src/PantheonTerminal.vala	2013-03-09 12:42:22 +0000
@@ -44,6 +44,7 @@
         public int minimum_height;
 
         construct {
+            flags |= ApplicationFlags.HANDLES_COMMAND_LINE;
             print_version = false;
             build_data_dir = Constants.DATADIR;
             build_pkg_data_dir = Constants.PKGDATADIR;
@@ -90,13 +91,44 @@
                     warning (e.message);
                 }
             }
-
+        }
+
+        private int _command_line (ApplicationCommandLine command_line) {
+            var context = new OptionContext ("File");
+            context.add_main_entries (entries, "pantheon-terminal");
+            context.add_group (Gtk.get_option_group (true));
+
+            string[] args = command_line.get_arguments ();
+
+            try {
+                unowned string[] tmp = args;
+                context.parse (ref tmp);
+            } catch (Error e) {
+                stdout.printf ("pantheon-terminal: ERROR: " + e.message + "\n");
+                return 0;
+            }
+
+            if (print_version) {
+                stdout.printf ("Pantheon Terminal %s\n", Constants.VERSION);
+                stdout.printf ("Copyright 2011-2012 Terminal Developers.\n");
+                return 0;
+            }
             if (command_e != null) {
                 new_window_with_programs (command_e);
-                return;
+                return 0;
             }
             new_window ();
-        }
+            return 0;
+        }
+
+        public override int command_line (ApplicationCommandLine command_line) {
+            // keep the application running until we are done with this commandline
+            this.hold ();
+            int res = _command_line (command_line);
+            this.release ();
+            return res;
+        }
+
 
         public void new_window () {
             var window = new PantheonTerminalWindow (this);
@@ -135,6 +167,7 @@
             }
             return null;
         }
+
         static const OptionEntry[] entries = {
             { "shell", 's', 0, OptionArg.STRING, ref app_shell_name, N_("Set shell at launch"), "" },
             { "version", 'v', 0, OptionArg.NONE, out print_version, N_("Print version info and exit"), null },
@@ -144,23 +177,6 @@
 
         public static int main (string[] args) {
             app_cmd_name = "Pantheon Terminal";
-
-            var context = new OptionContext ("File");
-            context.add_main_entries (entries, "pantheon-terminal");
-            context.add_group (Gtk.get_option_group (true));
-
-            try {
-                context.parse (ref args);
-            } catch (Error e) {
-                stdout.printf ("pantheon-terminal: ERROR: " + e.message + "\n");
-                return 0;
-            }
-
-            if (print_version) {
-                stdout.printf ("Pantheon Terminal %s\n", Constants.VERSION);
-                stdout.printf ("Copyright 2011-2012 Terminal Developers.\n");
-                return 0;
-            }
             var app = new PantheonTerminalApp ();
             return app.run (args);
         }