svn merge 51950

diff --git a/debian/rules b/debian/rules
index a5cdb95..e900bed 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,8 @@ DEB_DH_STRIP_ARGS := --dbg-package=libedje-dbg
 DEB_CONFIGURE_EXTRA_FLAGS := 
 #DEB_SOURCE_VERSION := $(shell grep AC_INIT $(DEB_SRCDIR)/configure.ac | cut -d, -f2 | tr -d ' []')
 DEB_SOURCE_VERSION := $(shell )
-CFLAGS += -fvisibility=hidden -ffast-math
-LDFLAGS += -fvisibility=hidden
+CFLAGS += -fvisibility=hidden -ffast-math -fPIC
+LDFLAGS += -fvisibility=hidden -Wl,--hash-style=both -Wl,--as-needed
 
 build/libedje-doc::
        cd $(DEB_SRCDIR)/doc && make doc

diff --git a/src/lib/Edje.h b/src/lib/Edje.h
index 6c599e2..29c864d 100644 (file)
--- a/src/lib/Edje.h
+++ b/src/lib/Edje.h
@@ -309,28 +309,28 @@ struct _Edje_External_Param_Info
 {
    const char *name;
    Edje_External_Param_Type type;
-   union {  
-      struct {  
-         int def, min, max, step;  
-      } i;  
-      struct {  
-         double def, min, max, step;  
-      } d;  
-      struct {  
-         const char *def;  
-         const char *accept_fmt;  
-         const char *deny_fmt;  
-      } s;  
-      struct {  
-         int def;  
-         const char *false_str;  
-         const char *true_str;  
-      } b;  
-      struct {  
-         const char *def;  
-         const char **choices; /* NULL terminated array */  
-      } c;  
-   } info; 
+   union {
+      struct {
+         int def, min, max, step;
+      } i;
+      struct {
+         double def, min, max, step;
+      } d;
+      struct {
+         const char *def;
+         const char *accept_fmt;
+         const char *deny_fmt;
+      } s;
+      struct {
+         int def;
+         const char *false_str;
+         const char *true_str;
+      } b;
+      struct {
+         const char *def;
+         const char **choices; /* NULL terminated array */
+      } c;
+   } info;
 };
 typedef struct _Edje_External_Param_Info Edje_External_Param_Info;
 
@@ -570,15 +570,15 @@ typedef void (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Mess
    EAPI void             edje_object_part_text_select_begin            (const Evas_Object *obj, const char *part);
    EAPI void             edje_object_part_text_select_extend           (const Evas_Object *obj, const char *part);
        
-   EAPI Eina_Bool        edje_object_part_text_cursor_next                 (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-   EAPI Eina_Bool        edje_object_part_text_cursor_prev                 (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-   EAPI Eina_Bool        edje_object_part_text_cursor_up                   (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-   EAPI Eina_Bool        edje_object_part_text_cursor_down                 (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-   EAPI void             edje_object_part_text_cursor_begin_set            (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-   EAPI void             edje_object_part_text_cursor_end_set              (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-   EAPI void             edje_object_part_text_cursor_copy                 (const Evas_Object *obj, const char *part, Edje_Cursor src, Edje_Cursor dst);
-   EAPI void             edje_object_part_text_cursor_line_begin_set       (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-   EAPI void             edje_object_part_text_cursor_line_end_set         (const Evas_Object *obj, const char *part, Edje_Cursor cur);
+   EAPI Eina_Bool        edje_object_part_text_cursor_next                 (Evas_Object *obj, const char *part, Edje_Cursor cur);
+   EAPI Eina_Bool        edje_object_part_text_cursor_prev                 (Evas_Object *obj, const char *part, Edje_Cursor cur);
+   EAPI Eina_Bool        edje_object_part_text_cursor_up                   (Evas_Object *obj, const char *part, Edje_Cursor cur);
+   EAPI Eina_Bool        edje_object_part_text_cursor_down                 (Evas_Object *obj, const char *part, Edje_Cursor cur);
+   EAPI void             edje_object_part_text_cursor_begin_set            (Evas_Object *obj, const char *part, Edje_Cursor cur);
+   EAPI void             edje_object_part_text_cursor_end_set              (Evas_Object *obj, const char *part, Edje_Cursor cur);
+   EAPI void             edje_object_part_text_cursor_copy                 (Evas_Object *obj, const char *part, Edje_Cursor src, Edje_Cursor dst);
+   EAPI void             edje_object_part_text_cursor_line_begin_set       (Evas_Object *obj, const char *part, Edje_Cursor cur);
+   EAPI void             edje_object_part_text_cursor_line_end_set         (Evas_Object *obj, const char *part, Edje_Cursor cur);
    EAPI Eina_Bool        edje_object_part_text_cursor_coord_set            (Evas_Object *obj, const char *part, Edje_Cursor cur, Evas_Coord x, Evas_Coord y);
    EAPI Eina_Bool        edje_object_part_text_cursor_is_format_get        (const Evas_Object *obj, const char *part, Edje_Cursor cur);
    EAPI Eina_Bool        edje_object_part_text_cursor_is_visible_format_get(const Evas_Object *obj, const char *part, Edje_Cursor cur);

diff --git a/src/lib/edje_cache.c b/src/lib/edje_cache.c
index 7a76429..b95428d 100644 (file)
--- a/src/lib/edje_cache.c
+++ b/src/lib/edje_cache.c
@@ -163,9 +163,9 @@ _edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Co
      }
 
    if (edf->minor > EDJE_FILE_MINOR)
-     {  
-        WRN("`%s` may use feature from a newer edje and could not show up as expected.", file);  
-     } 
+     {
+       WRN("`%s` may use feature from a newer edje and could not show up as expected.", file);
+     }
 
    edf->path = eina_stringshare_add(file);
    edf->references = 1;
@@ -544,8 +544,6 @@ edje_file_cache_get(void)
 /**
  * @brief Clean the file cache.
  *
- * @return The file cache size.
- *
  * This function cleans the file cache entries, but keeps this cache's
  * size to the last value set.
  *
@@ -615,8 +613,6 @@ edje_collection_cache_get(void)
 /**
  * @brief Clean the collection cache.
  *
- * @return The collection cache size.
- *
  * This function cleans the collection cache, but keeps this cache's
  * size to the last value set.
  *

diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index 57a0c18..e6cc65e 100644 (file)
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -1757,6 +1757,7 @@ void _edje_entry_cursor_begin(Edje_Real_Part *rp, Edje_Cursor cur);
 void _edje_entry_cursor_end(Edje_Real_Part *rp, Edje_Cursor cur);
 void _edje_entry_cursor_line_begin(Edje_Real_Part *rp, Edje_Cursor cur);
 void _edje_entry_cursor_line_end(Edje_Real_Part *rp, Edje_Cursor cur);
+Eina_Bool _edje_entry_cursor_coord_set(Edje_Real_Part *rp, Edje_Cursor cur, int x, int y);
 Eina_Bool _edje_entry_cursor_is_format_get(Edje_Real_Part *rp, Edje_Cursor cur);
 Eina_Bool _edje_entry_cursor_is_visible_format_get(Edje_Real_Part *rp, Edje_Cursor cur);
 const char *_edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur);

diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index 3236e6f..b1bbc3b 100644 (file)
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -2061,7 +2061,7 @@ edje_object_part_text_input_panel_enabled_get(const Evas_Object *obj, const char
  * @param part The part name
  */
 EAPI Eina_Bool
-edje_object_part_text_cursor_next(const Evas_Object *obj, const char *part, Edje_Cursor cur)
+edje_object_part_text_cursor_next(Evas_Object *obj, const char *part, Edje_Cursor cur)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -2084,7 +2084,7 @@ edje_object_part_text_cursor_next(const Evas_Object *obj, const char *part, Edje
  * @param part The part name
  */
 EAPI Eina_Bool
-edje_object_part_text_cursor_prev(const Evas_Object *obj, const char *part, Edje_Cursor cur)
+edje_object_part_text_cursor_prev(Evas_Object *obj, const char *part, Edje_Cursor cur)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -2107,7 +2107,7 @@ edje_object_part_text_cursor_prev(const Evas_Object *obj, const char *part, Edje
  * @param part The part name
  */
 EAPI Eina_Bool
-edje_object_part_text_cursor_up(const Evas_Object *obj, const char *part, Edje_Cursor cur)
+edje_object_part_text_cursor_up(Evas_Object *obj, const char *part, Edje_Cursor cur)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -2130,7 +2130,7 @@ edje_object_part_text_cursor_up(const Evas_Object *obj, const char *part, Edje_C
  * @param part The part name
  */
 EAPI Eina_Bool
-edje_object_part_text_cursor_down(const Evas_Object *obj, const char *part, Edje_Cursor cur)
+edje_object_part_text_cursor_down(Evas_Object *obj, const char *part, Edje_Cursor cur)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -2153,7 +2153,7 @@ edje_object_part_text_cursor_down(const Evas_Object *obj, const char *part, Edje
  * @param part The part name
  */
 EAPI void
-edje_object_part_text_cursor_begin_set(const Evas_Object *obj, const char *part, Edje_Cursor cur)
+edje_object_part_text_cursor_begin_set(Evas_Object *obj, const char *part, Edje_Cursor cur)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -2175,7 +2175,7 @@ edje_object_part_text_cursor_begin_set(const Evas_Object *obj, const char *part,
  * @param part The part name
  */
 EAPI void
-edje_object_part_text_cursor_end_set(const Evas_Object *obj, const char *part, Edje_Cursor cur)
+edje_object_part_text_cursor_end_set(Evas_Object *obj, const char *part, Edje_Cursor cur)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -2197,7 +2197,7 @@ edje_object_part_text_cursor_end_set(const Evas_Object *obj, const char *part, E
  * @param part The part name
  */
 EAPI void
-edje_object_part_text_cursor_copy(const Evas_Object *obj, const char *part, Edje_Cursor src, Edje_Cursor dst)
+edje_object_part_text_cursor_copy(Evas_Object *obj, const char *part, Edje_Cursor src, Edje_Cursor dst)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -2219,7 +2219,7 @@ edje_object_part_text_cursor_copy(const Evas_Object *obj, const char *part, Edje
  * @param part The part name
  */
 EAPI void
-edje_object_part_text_cursor_line_begin_set(const Evas_Object *obj, const char *part, Edje_Cursor cur)
+edje_object_part_text_cursor_line_begin_set(Evas_Object *obj, const char *part, Edje_Cursor cur)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -2241,7 +2241,7 @@ edje_object_part_text_cursor_line_begin_set(const Evas_Object *obj, const char *
  * @param part The part name
  */
 EAPI void
-edje_object_part_text_cursor_line_end_set(const Evas_Object *obj, const char *part, Edje_Cursor cur)
+edje_object_part_text_cursor_line_end_set(Evas_Object *obj, const char *part, Edje_Cursor cur)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -2346,7 +2346,7 @@ edje_object_part_text_cursor_content_get(const Evas_Object *obj, const char *par
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return NULL;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return NULL;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -5166,4 +5166,5 @@ edje_string_id_get(const Edje_String *es)
    return es->str;
 }
 
+
 /* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/