Changeset 21148 in webkit

Timestamp:

Apr 27, 2007 7:55:19 AM (17 years ago)

Author:

bdash

Message:

2007-04-27 Nazar Kulyk <​schamane@myeburg.net>

Reviewed by Mark Rowe.

Basic auto-correction of user-entered URLs.

• GdkLauncher/main.cpp: (autocorrectURL): (goToURLBarText): (main):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• GdkLauncher/main.cpp (modified) (5 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-04-27  Nazar Kulyk  <schamane@myeburg.net>
+
+        Reviewed by Mark Rowe.
+
+        Basic auto-correction of user-entered URLs.
+
+        * GdkLauncher/main.cpp:
+        (autocorrectURL):
+        (goToURLBarText):
+        (main):
+
 2007-04-28  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKitTools/GdkLauncher/main.cpp

@@ -28 +28 @@
 static FrameGdk* gFrame;
 
-static bool stringIsEmpty(const char* str)
-{
-    return !str || !*str;
-}
-
 static bool stringIsEqual(const char* str1, const char* str2)
 {
@@ -43 +38 @@
 }
 
+static String autocorrectURL(const String& url)
+{
+    String parsedURL = url;
+    if (!url.startsWith("http://") && !url.startsWith("https://")
+        && !url.startsWith("file://") && !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 (stringIsEmpty(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);
+    gFrame->loader()->load(ResourceRequest(parsedURL));
 }
 
@@ -115 +120 @@
     gtk_init(&argc, &argv);
 
-    const char* url = "http://www.google.com";
+    String url("http://www.google.com");
     bool exitAfterLoading = false;
     bool dumpRenderTree = false;
@@ -135 +140 @@
             dumpRenderTree = true;
         else
-            url = currArg;
+            url = autocorrectURL(currArg);
     }
 
@@ -203 +208 @@
     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