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

[demarchi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 7ebbadad8a38e23259feef196095e767966ead84
Author: demarchi at webkit.org <demarchi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 16:56:47 2010 +0000

    2010-09-23  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Reviewed by Csaba Osztrogonác.
    
            [EFL] Fix warnings during build
            https://bugs.webkit.org/show_bug.cgi?id=46354
    
            * ewk/ewk_frame.cpp:
            (ewk_frame_text_matches_nth_pos_get): Change argument type because
            it's meant to be always positive.
            * ewk/ewk_frame.h: Ditto.
            * ewk/ewk_view.cpp:
            (ewk_view_exceeded_database_quota): Add missing "%" causing warning about number of
            arguments to printf-like function.
            * ewk/ewk_view.h: Add missing initialization.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68154 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 5df265c..ccf0422 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-23  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [EFL] Fix warnings during build
+        https://bugs.webkit.org/show_bug.cgi?id=46354
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_text_matches_nth_pos_get): Change argument type because
+        it's meant to be always positive.
+        * ewk/ewk_frame.h: Ditto.
+        * ewk/ewk_view.cpp:
+        (ewk_view_exceeded_database_quota): Add missing "%" causing warning about number of
+        arguments to printf-like function.
+        * ewk/ewk_view.h: Add missing initialization.
+
 2010-09-21  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp
index 038e105..1395fa5 100644
--- a/WebKit/efl/ewk/ewk_frame.cpp
+++ b/WebKit/efl/ewk/ewk_frame.cpp
@@ -847,7 +847,7 @@ static bool _ewk_frame_rect_is_negative_value(const WebCore::IntRect& i)
  * @return @c EINA_TRUE on success, @c EINA_FALSE for failure - when no matches found or 
  *         n bigger than search results.
  */
-Eina_Bool ewk_frame_text_matches_nth_pos_get(Evas_Object* o, int n, int* x, int* y)
+Eina_Bool ewk_frame_text_matches_nth_pos_get(Evas_Object* o, size_t n, int* x, int* y)
 {
     EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
diff --git a/WebKit/efl/ewk/ewk_frame.h b/WebKit/efl/ewk/ewk_frame.h
index 9394446..156bd82 100644
--- a/WebKit/efl/ewk/ewk_frame.h
+++ b/WebKit/efl/ewk/ewk_frame.h
@@ -160,7 +160,7 @@ EAPI unsigned int ewk_frame_text_matches_mark(Evas_Object *o, const char *string
 EAPI Eina_Bool    ewk_frame_text_matches_unmark_all(Evas_Object *o);
 EAPI Eina_Bool    ewk_frame_text_matches_highlight_set(Evas_Object *o, Eina_Bool highlight);
 EAPI Eina_Bool    ewk_frame_text_matches_highlight_get(const Evas_Object *o);
-EAPI Eina_Bool    ewk_frame_text_matches_nth_pos_get(Evas_Object *o, int n, int *x, int *y);
+EAPI Eina_Bool    ewk_frame_text_matches_nth_pos_get(Evas_Object *o, size_t n, int *x, int *y);
 
 EAPI Eina_Bool    ewk_frame_stop(Evas_Object *o);
 EAPI Eina_Bool    ewk_frame_reload(Evas_Object *o);
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index 76e4bf5..acddcd2 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -3769,7 +3769,7 @@ uint64_t ewk_view_exceeded_database_quota(Evas_Object* o, Evas_Object* frame, co
     if (!sd->api->exceeded_database_quota)
         return 0;
 
-    INF("current_size=%"PRIu64" expected_size="PRIu64, current_size, expected_size);
+    INF("current_size=%"PRIu64" expected_size=%"PRIu64, current_size, expected_size);
     return sd->api->exceeded_database_quota(sd, frame, databaseName, current_size, expected_size);
 }
 
diff --git a/WebKit/efl/ewk/ewk_view.h b/WebKit/efl/ewk/ewk_view.h
index be27f68..102f455 100644
--- a/WebKit/efl/ewk/ewk_view.h
+++ b/WebKit/efl/ewk/ewk_view.h
@@ -151,7 +151,7 @@ struct _Ewk_View_Smart_Class {
  * @see EWK_VIEW_SMART_CLASS_INIT_VERSION
  * @see EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION
  */
-#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 
 /**
  * Initializer to zero a whole Ewk_View_Smart_Class structure.

-- 
WebKit Debian packaging