gdklauncher-urlparsing-0.7.patch

Index: WebKitTools/ChangeLog
===================================================================
--- WebKitTools/ChangeLog	(revision 21147)
+++ WebKitTools/ChangeLog	(working copy)
@@ -1,3 +1,13 @@
+2007-04-27  Nazar Kulyk  <schamane@myeburg.net>
+
+        Reviewed by NOBODY (OOPS!).
+
+        * GdkLauncher/main.cpp:
+        (autocorrectURL):
+        (goToUrlBarText):
+        (main):
+        Create initial url correction.
+
 2007-04-28  Mark Rowe  <mrowe@apple.com>
 
         Rubber-stamped by Anders.
Index: WebKitTools/GdkLauncher/main.cpp
===================================================================
--- WebKitTools/GdkLauncher/main.cpp	(revision 21144)
+++ WebKitTools/GdkLauncher/main.cpp	(working copy)
@@ -42,13 +42,22 @@ static void handleGdkEvent(GtkWidget* wi
     gFrame->handleGdkEvent(event);
 }
 
+static String autocorrectURL(String url)
+{
+    String parsedURL = url;
+    if (!url.startsWith("http://") && !url.startsWith("ftp://"))
+        parsedURL = String("http://") + url;
+    return parsedURL;
+}
+
 static void goToUrlBarText(GtkWidget* urlBarEntry)
 {
-    const gchar* url = gtk_entry_get_text(GTK_ENTRY(urlBarEntry));
-    if (strEmpty(url))
+    String url(gtk_entry_get_text(GTK_ENTRY(urlBarEntry)));
+    if (url.isEmpty())
         return;
-    // FIXME: append "http://" if doesn't have a scheme
-    gFrame->loader()->load(url, 0);
+    String parsedURL = autocorrectURL(url);
+    if (!parsedURL.isEmpty())
+        gFrame->loader()->load(ResourceRequest(parsedURL));
 }
 
 static void goButtonClickedCb(GtkWidget* widget, GtkWidget* entry)
@@ -114,7 +123,7 @@ int main(int argc, char* argv[]) 
 {
     gtk_init(&argc, &argv);
 
-    const char* url = "http://www.google.com";
+    String url("http://www.google.com");
     bool exitAfterLoading = false;
     bool dumpRenderTree = false;
     for (int argPos = 1; argPos < argc; ++argPos) {
@@ -134,7 +143,7 @@ int main(int argc, char* argv[]) 
         else if (strEq(currArg, "-dumprendertree"))
             dumpRenderTree = true;
         else
-            url = currArg;
+            url = autocorrectURL(currArg);
     }
 
     GtkWidget* menuMain = gtk_menu_new();
@@ -202,8 +211,7 @@ int main(int argc, char* argv[]) 
     gFrame->setView(frameView);
     frameView->ScrollView::setDrawable(frameWindow->window);
 
-    printf("OPENING URL == %s \n", url);
-    gFrame->loader()->load(ResourceRequest(KURL(url)));
+    gFrame->loader()->load(ResourceRequest(url));
     gtk_main();
 #if 0 // FIXME: this crashes at the moment. needs to provide DragClient
     delete page;