Title: [87808] trunk/Tools
Revision
87808
Author
carlo...@webkit.org
Date
2011-06-01 09:08:24 -0700 (Wed, 01 Jun 2011)

Log Message

2011-06-01  Carlos Garcia Campos  <cgar...@igalia.com>

        Reviewed by Martin Robinson.

        [GTK] run-launcher should run MiniBrowser in WebKit2
        https://bugs.webkit.org/show_bug.cgi?id=61858

        * Scripts/run-launcher: Check whether -2 command line option has
        been passed and run MiniBrowser instead of GtkLauncher.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (87807 => 87808)


--- trunk/Tools/ChangeLog	2011-06-01 16:01:12 UTC (rev 87807)
+++ trunk/Tools/ChangeLog	2011-06-01 16:08:24 UTC (rev 87808)
@@ -1,3 +1,13 @@
+2011-06-01  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] run-launcher should run MiniBrowser in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=61858
+
+        * Scripts/run-launcher: Check whether -2 command line option has
+        been passed and run MiniBrowser instead of GtkLauncher.
+
 2011-05-31  Hao Zheng  <zheng...@chromium.org>
 
         Reviewed by Dirk Pranke.

Modified: trunk/Tools/Scripts/run-launcher (87807 => 87808)


--- trunk/Tools/Scripts/run-launcher	2011-06-01 16:01:12 UTC (rev 87807)
+++ trunk/Tools/Scripts/run-launcher	2011-06-01 16:08:24 UTC (rev 87808)
@@ -65,7 +65,14 @@
 } else {
 
     if (isGtk()) {
-        $launcherPath = catdir($launcherPath, "Programs", "GtkLauncher");
+        if (isWK2()) {
+            $launcherPath = catdir($launcherPath, "Programs", "MiniBrowser");
+
+            # isWK2() removes the -2 option from @ARGV, but not @args. We do not want to pass -2 to MiniBrowser.
+            @args = @ARGV;
+        } else {
+            $launcherPath = catdir($launcherPath, "Programs", "GtkLauncher");
+        }
     }
     
     if (isEfl()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to