2007-11-05 Mark Rowe <mrowe@apple.com>

        Rubber-stamped by Alp Toker.

        Remove buggy "autocomplete" from GtkLauncher as it causes more problems than it solves.

        * GtkLauncher/main.cpp:
        (goToURLBarText):
        (main):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27438 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d64871484c9c67148ec933a3464001c6464539c3..acfaa11556315ef8f8455a3ab690f36d17b67528 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-05  Mark Rowe  <mrowe@apple.com>
+
+        Rubber-stamped by Alp Toker.
+
+        Remove buggy "autocomplete" from GtkLauncher as it causes more problems than it solves.
+
+        * GtkLauncher/main.cpp:
+        (goToURLBarText):
+        (main):
+

 2007-11-04  David D. Kilzer  <ddkilzer@webkit.org>
 
         bisect-builds doesn't work with nightly build r19992 or newer on Leopard
 2007-11-04  David D. Kilzer  <ddkilzer@webkit.org>
 
         bisect-builds doesn't work with nightly build r19992 or newer on Leopard

diff --git a/WebKitTools/GtkLauncher/main.cpp b/WebKitTools/GtkLauncher/main.cpp
index f0d072e116dfe1387e5af67ae1e11e8f77f965a3..3d62f4063fa146a901b5293bc9fd9ee5aa4920ad 100644 (file)
--- a/WebKitTools/GtkLauncher/main.cpp
+++ b/WebKitTools/GtkLauncher/main.cpp
@@ -13,26 +13,13 @@ static gchar* gTitle;
 static gint gProgress;
 static guint gStatusbarContextId;
 
 static gint gProgress;
 static guint gStatusbarContextId;
 

-static gchar* autocorrectURL(const gchar* url)
-{
-    if (strncmp("http://", url, 7) != 0 && strncmp("https://", url, 8) != 0 && strncmp("file://", url, 7) != 0 && strncmp("ftp://", url, 6) != 0) {
-        GString* string = g_string_new("http://");
-        g_string_append(string, url);
-        return g_string_free(string, FALSE);
-    }
-    
-    return g_strdup(url);
-}
-

 static void goToURLBarText(GtkWidget* urlBarEntry)
 {
     const gchar* url = gtk_entry_get_text(GTK_ENTRY(urlBarEntry));
     if (!url || strlen(url) == 0)
         return;
 
 static void goToURLBarText(GtkWidget* urlBarEntry)
 {
     const gchar* url = gtk_entry_get_text(GTK_ENTRY(urlBarEntry));
     if (!url || strlen(url) == 0)
         return;
 

-    gchar* parsedURL = autocorrectURL(url);
-    webkit_page_open(gPage, parsedURL);
-    g_free(parsedURL);
+    webkit_page_open(gPage, url);

 }
 
 static void goButtonClickedCallback(GtkWidget*, GtkWidget* entry)
 }
 
 static void goButtonClickedCallback(GtkWidget*, GtkWidget* entry)


@@ -175,14 +162,12 @@ int main(int argc, char* argv[])
     gtk_init(&argc, &argv);
     webkit_init();
 
     gtk_init(&argc, &argv);
     webkit_init();
 

-    gchar* url = autocorrectURL((argc > 1) ? argv[1] : "http://www.google.com");
-    

     setupMainWindowUI();
 
     setupMainWindowUI();
 

+    const gchar* url = static_cast<const gchar*>(argc > 1 ? argv[1] : "http://www.google.com");

     webkit_page_open(gPage, url);
 
     gtk_widget_show_all(gTopLevelWindow);
     webkit_page_open(gPage, url);
 
     gtk_widget_show_all(gTopLevelWindow);

-    g_free(url);

     gtk_main();
     return 0;
 }
     gtk_main();
     return 0;
 }