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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 8f72f22d3b37f5fc5f2d5a4fd5592d466ca21bfa
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 07:26:25 2010 +0000

    2010-08-28  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [EFL] Fix error message when theme loading fails
            https://bugs.webkit.org/show_bug.cgi?id=44775
    
            Parameters for logging were in the wrong order.
    
            No new functionality so no new tests.
    
            * platform/efl/ScrollbarEfl.cpp:
            (ScrollbarEfl::setParent): exchange argument order in log function
            call
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66300 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 11b2e85..6da8f2f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-28  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Fix error message when theme loading fails
+        https://bugs.webkit.org/show_bug.cgi?id=44775
+
+        Parameters for logging were in the wrong order.
+
+        No new functionality so no new tests.
+
+        * platform/efl/ScrollbarEfl.cpp:
+        (ScrollbarEfl::setParent): exchange argument order in log function
+        call
+
 2010-08-27  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/platform/efl/ScrollbarEfl.cpp b/WebCore/platform/efl/ScrollbarEfl.cpp
index 1030ebd..e413260 100644
--- a/WebCore/platform/efl/ScrollbarEfl.cpp
+++ b/WebCore/platform/efl/ScrollbarEfl.cpp
@@ -125,7 +125,7 @@ void ScrollbarEfl::setParent(ScrollView* view)
         int err = edje_object_load_error_get(o);
         const char* errmsg = edje_load_error_str(err);
         EINA_LOG_ERR("Could not load theme '%s' from file '%s': #%d '%s'",
-                     theme.utf8().data(), group, err, errmsg);
+                     group, theme.utf8().data(), err, errmsg);
         return;
     }
 

-- 
WebKit Debian packaging