[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[philn at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 25b8424f6eee0ec141b6f2963b429c2b57befb12
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 08:06:56 2010 +0000

    2010-03-09  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] testkeyevents doesn't stop if input event injection fails
            https://bugs.webkit.org/show_bug.cgi?id=35922
    
            * tests/testkeyevents.c:
            (load_status_cb): Added a safeguard to exit from the test if the
            input event injection failed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55768 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index b83babd..9add6e2 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-09  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] testkeyevents doesn't stop if input event injection fails
+        https://bugs.webkit.org/show_bug.cgi?id=35922
+
+        * tests/testkeyevents.c:
+        (load_status_cb): Added a safeguard to exit from the test if the
+        input event injection failed.
+
 2010-03-09  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Unreviewed. Documentation control files update for 1.1.23.
diff --git a/WebKit/gtk/tests/testkeyevents.c b/WebKit/gtk/tests/testkeyevents.c
index ee7728c..3c9e198 100644
--- a/WebKit/gtk/tests/testkeyevents.c
+++ b/WebKit/gtk/tests/testkeyevents.c
@@ -100,8 +100,9 @@ static void load_status_cb(WebKitWebView* webView, GParamSpec* spec, gpointer da
     KeyEventFixture* fixture = (KeyEventFixture*)data;
     WebKitLoadStatus status = webkit_web_view_get_load_status(webView);
     if (status == WEBKIT_LOAD_FINISHED) {
-        gtk_test_widget_send_key(GTK_WIDGET(fixture->webView),
-                                 gdk_unicode_to_keyval('a'), 0);
+        if (!gtk_test_widget_send_key(GTK_WIDGET(fixture->webView),
+                                      gdk_unicode_to_keyval('a'), 0))
+            g_assert_not_reached();
     }
 
 }

-- 
WebKit Debian packaging