Title: [133585] trunk/Tools
Revision
133585
Author
commit-qu...@webkit.org
Date
2012-11-06 04:14:29 -0800 (Tue, 06 Nov 2012)

Log Message

[EFL][WK2] Minibrowser forgets http variables when url includes ampersand
https://bugs.webkit.org/show_bug.cgi?id=101061

Patch by Jussi Kukkonen <jussi.kukko...@intel.com> on 2012-11-06
Reviewed by Kenneth Rohde Christiansen.

Elementary entry only returns 'markup' text, meaning ampersands
in a url will become "&amp;". Use elm_entry_markup_to_utf8() and
elm_entry_utf8_to_markup() when interacting with the entry.

* MiniBrowser/efl/main.c:
(on_url_changed):
(on_url_bar_activated):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (133584 => 133585)


--- trunk/Tools/ChangeLog	2012-11-06 12:09:21 UTC (rev 133584)
+++ trunk/Tools/ChangeLog	2012-11-06 12:14:29 UTC (rev 133585)
@@ -1,3 +1,18 @@
+2012-11-06  Jussi Kukkonen  <jussi.kukko...@intel.com>
+
+        [EFL][WK2] Minibrowser forgets http variables when url includes ampersand
+        https://bugs.webkit.org/show_bug.cgi?id=101061
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Elementary entry only returns 'markup' text, meaning ampersands
+        in a url will become "&amp;". Use elm_entry_markup_to_utf8() and
+        elm_entry_utf8_to_markup() when interacting with the entry.
+
+        * MiniBrowser/efl/main.c:
+        (on_url_changed):
+        (on_url_bar_activated):
+
 2012-11-06  Balazs Kelemen  <kbal...@webkit.org>
 
         DumpRenderTree should have --pixel-tests option again

Modified: trunk/Tools/MiniBrowser/efl/main.c (133584 => 133585)


--- trunk/Tools/MiniBrowser/efl/main.c	2012-11-06 12:09:21 UTC (rev 133584)
+++ trunk/Tools/MiniBrowser/efl/main.c	2012-11-06 12:14:29 UTC (rev 133585)
@@ -233,7 +233,11 @@
 on_url_changed(void *user_data, Evas_Object *webview, void *event_info)
 {
     Browser_Window *window = (Browser_Window *)user_data;
-    elm_entry_entry_set(window->url_bar, ewk_view_url_get(window->webview));
+
+    char *url = ""
+    elm_entry_entry_set(window->url_bar, url);
+
+    free(url);
 }
 
 static void
@@ -455,9 +459,12 @@
 {
     Browser_Window *app_data = (Browser_Window *)user_data;
 
-    const char *user_url = elm_entry_entry_get(url_bar);
+    const char *markup_url = elm_entry_entry_get(url_bar);
+    char *user_url = elm_entry_markup_to_utf8(markup_url);
     char *url = ""
     ewk_view_url_set(app_data->webview, url);
+
+    free(user_url);
     free(url);
 
     /* Give focus back to the view */
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to