[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 13:19:30 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8c44387ecf07d0b34c77db205bc9bd1dab81c251
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 11 02:47:17 2010 +0000

    2010-09-10  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] Fix warnings because of bad assignments in testatk.c
            https://bugs.webkit.org/show_bug.cgi?id=45538
    
            Use AtkObject and AtkText instances properly in the code.
    
            * tests/testatk.c:
            (testWebkitAtkListsOfItems):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 82cd485..3c9b883 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10  Mario Sanchez Prada  <msanchez at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Fix warnings because of bad assignments in testatk.c
+        https://bugs.webkit.org/show_bug.cgi?id=45538
+
+        Use AtkObject and AtkText instances properly in the code.
+
+        * tests/testatk.c:
+        (testWebkitAtkListsOfItems):
+
 2010-09-10  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/gtk/tests/testatk.c b/WebKit/gtk/tests/testatk.c
index 9930bc2..dbe88b0 100644
--- a/WebKit/gtk/tests/testatk.c
+++ b/WebKit/gtk/tests/testatk.c
@@ -876,17 +876,17 @@ static void testWebkitAtkListsOfItems(void)
     g_assert(atk_object_get_role(uList) == ATK_ROLE_LIST);
     g_assert_cmpint(atk_object_get_n_accessible_children(uList), ==, 3);
 
-    item1 = ATK_TEXT(atk_object_ref_accessible_child(uList, 0));
-    item2 = ATK_TEXT(atk_object_ref_accessible_child(uList, 1));
-    item3 = ATK_TEXT(atk_object_ref_accessible_child(uList, 2));
+    item1 = atk_object_ref_accessible_child(uList, 0);
+    item2 = atk_object_ref_accessible_child(uList, 1);
+    item3 = atk_object_ref_accessible_child(uList, 2);
 
     g_assert_cmpint(atk_object_get_n_accessible_children(item1), ==, 0);
     g_assert_cmpint(atk_object_get_n_accessible_children(item2), ==, 1);
     g_assert_cmpint(atk_object_get_n_accessible_children(item3), ==, 1);
 
-    g_assert_cmpstr(atk_text_get_text(item1, 0, -1), ==, "\342\200\242 text only");
-    g_assert_cmpstr(atk_text_get_text(item2, 0, -1), ==, "\342\200\242 link only");
-    g_assert_cmpstr(atk_text_get_text(item3, 0, -1), ==, "\342\200\242 text and a link");
+    g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item1), 0, -1), ==, "\342\200\242 text only");
+    g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item2), 0, -1), ==, "\342\200\242 link only");
+    g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item3), 0, -1), ==, "\342\200\242 text and a link");
 
     g_object_unref(item1);
     g_object_unref(item2);
@@ -899,13 +899,13 @@ static void testWebkitAtkListsOfItems(void)
     g_assert(atk_object_get_role(oList) == ATK_ROLE_LIST);
     g_assert_cmpint(atk_object_get_n_accessible_children(oList), ==, 3);
 
-    item1 = ATK_TEXT(atk_object_ref_accessible_child(oList, 0));
-    item2 = ATK_TEXT(atk_object_ref_accessible_child(oList, 1));
-    item3 = ATK_TEXT(atk_object_ref_accessible_child(oList, 2));
+    item1 = atk_object_ref_accessible_child(oList, 0);
+    item2 = atk_object_ref_accessible_child(oList, 1);
+    item3 = atk_object_ref_accessible_child(oList, 2);
 
-    g_assert_cmpstr(atk_text_get_text(item1, 0, -1), ==, "1 text only");
-    g_assert_cmpstr(atk_text_get_text(item2, 0, -1), ==, "2 link only");
-    g_assert_cmpstr(atk_text_get_text(item3, 0, -1), ==, "3 text and a link");
+    g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item1), 0, -1), ==, "1 text only");
+    g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item2), 0, -1), ==, "2 link only");
+    g_assert_cmpstr(atk_text_get_text(ATK_TEXT(item3), 0, -1), ==, "3 text and a link");
 
     g_assert_cmpint(atk_object_get_n_accessible_children(item1), ==, 0);
     g_assert_cmpint(atk_object_get_n_accessible_children(item2), ==, 1);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list