remove source7. fix mistypos

diff --git a/data/edc.vba b/data/edc.vba
index 415493a..274ca0e 100644 (file)
--- a/data/edc.vba
+++ b/data/edc.vba
@@ -57,7 +57,7 @@ syn keyword   edcLabel        mouse_events repeat_events clip_to contained
 syn keyword    edcLabel        x y z confine events scale contained
 syn keyword    edcLabel        ignore_flags precise_is_inside contained
 syn keyword    edcLabel        use_alternate_font_metrics entry_mode contained
-syn keyword    edcLabel        source source2 source3 source4 source7 contained
+syn keyword    edcLabel        source source2 source3 source4 contained
 syn keyword    edcLabel        source5 source6 multiline pointer_mode contained
 syn keyword    edcLabel        state visible step aspect fixed middle contained
 syn keyword    edcLabel        aspect_preference elipsis image contained

diff --git a/data/edc.vim b/data/edc.vim
index 436ce65..1d9be9c 100644 (file)
--- a/data/edc.vim
+++ b/data/edc.vim
@@ -28,7 +28,7 @@ syn keyword   cLabel          border color color2 color3 font size fit align
 syn keyword    cLabel          signal source action transition in target after
 syn keyword    cLabel          text smooth inherit scale middle ignore_flags
 syn keyword    cLabel          alias events entry_mode select_mode multiline
-syn keyword    cLabel          source1 source2 source3 source4 source5 source6 source7
+syn keyword    cLabel          source1 source2 source3 source4 source5 source6
 syn keyword    cLabel          text_source transitions layout padding
 syn keyword    cLabel          size_w size_h size_max_w size_max_h size_min_w size_min_w
 syn keyword    cLabel          spread scale_hint elipsis pointer_mode prefer

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 32d6610..65d08f3 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -45,8 +45,8 @@ edje_player_SOURCES = edje_player.c
 edje_player_LDADD = $(top_builddir)/src/lib/libedje.la $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
 edje_player_LDFLAGS = @lt_enable_auto_import@
 
-edje_convert_SOURCES = edje_convert.c edje_convert_main.c edje_data_convert.c  
-edje_convert_LDADD = $(top_builddir)/src/lib/libedje.la $(EVIL_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS)   
+edje_convert_SOURCES = edje_convert.c edje_convert_main.c edje_data_convert.c
+edje_convert_LDADD = $(top_builddir)/src/lib/libedje.la $(EVIL_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
 edje_convert_LDFLAGS = @lt_enable_auto_import@
 
 EXTRA_DIST = @EDJE_RECC_PRG@ edje_prefix.h edje_cc.h edje_convert.h

diff --git a/src/bin/edje_cc_handlers.c b/src/bin/edje_cc_handlers.c
index 915b9ec..8bd45f9 100755 (executable)
--- a/src/bin/edje_cc_handlers.c
+++ b/src/bin/edje_cc_handlers.c
@@ -127,7 +127,6 @@ static void st_collections_group_parts_part_source3(void);
 static void st_collections_group_parts_part_source4(void);
 static void st_collections_group_parts_part_source5(void);
 static void st_collections_group_parts_part_source6(void);
-static void st_collections_group_parts_part_source7(void);
 static void st_collections_group_parts_part_entry_mode(void);
 static void st_collections_group_parts_part_select_mode(void);
 static void st_collections_group_parts_part_multiline(void);
@@ -366,7 +365,6 @@ New_Statement_Handler statement_handlers[] =
      {"collections.group.parts.part.source4", st_collections_group_parts_part_source4},
      {"collections.group.parts.part.source5", st_collections_group_parts_part_source5},
      {"collections.group.parts.part.source6", st_collections_group_parts_part_source6},
-     {"collections.group.parts.part.source7", st_collections_group_parts_part_source7},
      {"collections.group.parts.part.dragable.x", st_collections_group_parts_part_dragable_x},
      {"collections.group.parts.part.dragable.y", st_collections_group_parts_part_dragable_y},
      {"collections.group.parts.part.dragable.confine", st_collections_group_parts_part_dragable_confine},
@@ -896,7 +894,7 @@ _edje_part_description_alloc(unsigned char type, const char *collection, const c
 
    if (!result)
      {
-       ERR("%s: Error. Unknow type %i of part %s in collection %s.", progname, type, part, collection);
+       ERR("%s: Error. Unknown type %i of part %s in collection %s.", progname, type, part, collection);
        exit(-1);
      }
 
@@ -983,7 +981,7 @@ st_externals_external(void)
               0, sizeof (Edje_External_Directory));
        if (!edje_file->external_dir->entries)
          {
-            ERR("%s: Error. not enought memory", progname);
+            ERR("%s: Error. not enough memory", progname);
             exit(-1);
          }
 
@@ -1071,7 +1069,7 @@ st_images_image(void)
          0, sizeof (Edje_Image_Directory_Entry));
    if (!edje_file->image_dir->entries)
      {
-       ERR("%s: Error. No enought memory.", progname);
+       ERR("%s: Error. No enough memory.", progname);
        exit(-1);
      }
 
@@ -1160,7 +1158,7 @@ ob_images_set(void)
          0, sizeof (Edje_Image_Directory_Set));
    if (!edje_file->image_dir->sets)
      {
-       ERR("%s: Error. Not enought memory.", progname);
+       ERR("%s: Error. Not enough memory.", progname);
        exit(-1);
      }
    edje_file->image_dir->sets[edje_file->image_dir->sets_count - 1].id = edje_file->image_dir->sets_count - 1;
@@ -2359,7 +2357,7 @@ ob_collections_group_parts_part(void)
    pc->parts = realloc(pc->parts, pc->parts_count * sizeof (Edje_Part *));
    if (!pc->parts)
      {
-       ERR("%s: Error. Not enought memory.", progname);
+       ERR("%s: Error. Not enough memory.", progname);
        exit(-1);
      }
    pc->parts[pc->parts_count - 1] = ep;
@@ -2855,32 +2853,6 @@ st_collections_group_parts_part_source6(void)
 
 /**
     @page edcref
-    @property
-        source7
-    @parameters
-        [another group's name]
-    @effect
-        Only available to TEXTBLOCK parts. It is used for the group to be 
-        loaded and used for the preedit string display.
-    @endproperty
-*/
-static void
-st_collections_group_parts_part_source7(void)
-{
-   Edje_Part_Collection *pc;
-   Edje_Part *ep;
-
-   check_arg_count(1);
-
-   pc = eina_list_data_get(eina_list_last(edje_collections));
-   ep = eina_list_data_get(eina_list_last(pc->parts));
-
-   //FIXME: validate this somehow (need to decide on the format also)
-   ep->source7 = parse_str(0);
-}
-
-/**
-    @page edcref
 
     @property
         effect
@@ -3217,7 +3189,7 @@ static void ob_collections_group_parts_part_box_items_item(void)
    ep->items = realloc(ep->items, sizeof (Edje_Pack_Element*) * ep->items_count);
    if (!ep->items)
      {
-       ERR("%s: Error. Not enought memory.", progname);
+       ERR("%s: Error. Not enough memory.", progname);
        exit(-1);
      }
 
@@ -4408,7 +4380,7 @@ st_collections_group_parts_part_description_color3(void)
         [X axis] [Y axis]
     @effect
         Moves a corner to a relative position inside the container of the
-        relative "to" part. Values from 0.0 (0%, begining) to 1.0 (100%, end)
+        relative "to" part. Values from 0.0 (0%, beginning) to 1.0 (100%, end)
         of each axis.
     @endproperty
 */
@@ -4438,7 +4410,7 @@ st_collections_group_parts_part_description_rel1_relative(void)
     @parameters
         [X axis] [Y axis]
     @effect
-        Affects the corner postion a fixed number of pixels along each axis.
+        Affects the corner position a fixed number of pixels along each axis.
     @endproperty
 */
 static void

diff --git a/src/bin/edje_cc_out.c b/src/bin/edje_cc_out.c
index a87fef5..59079db 100644 (file)
--- a/src/bin/edje_cc_out.c
+++ b/src/bin/edje_cc_out.c
@@ -158,7 +158,7 @@ check_image_part_desc (Edje_Part_Collection *pc, Edje_Part *ep,
 {
    unsigned int i;
 
-#if 0 /* FIXME: This check sounds like not a usefull one */
+#if 0 /* FIXME: This check sounds like not a useful one */
    if (epd->image.id == -1)
      ERR(ef, "Collection %s(%i): image attributes missing for "
         "part \"%s\", description \"%s\" %f\n",
@@ -939,7 +939,7 @@ data_write_scripts(Eet_File *ef)
 
 typedef struct _Edje_Lua_Script_Writer_Struct Edje_Lua_Script_Writer_Struct;
 
-struct _Edje_Lua_Script_Writer_Struct 
+struct _Edje_Lua_Script_Writer_Struct
 {
    char *buf;
    int size;

diff --git a/src/bin/edje_prefix.c b/src/bin/edje_prefix.c
index 4264cfe..9c27e90 100644 (file)
--- a/src/bin/edje_prefix.c
+++ b/src/bin/edje_prefix.c
@@ -205,7 +205,7 @@ _e_prefix_share_hunt(void)
    char buf[4096], buf2[4096], *p;
    struct stat st;
 
-   /* sometimes this isnt the case - so we need to do a more exhaustive search
+   /* sometimes this isn't the case - so we need to do a more exhaustive search
     * through more parent and subdirs. hre is an example i have seen:
     *
     * /blah/whatever/exec/bin/exe

diff --git a/src/lib/Edje.h b/src/lib/Edje.h
index 778ca59..6c599e2 100644 (file)
--- a/src/lib/Edje.h
+++ b/src/lib/Edje.h
@@ -615,7 +615,7 @@ typedef void (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Mess
    EAPI Evas_Object              *edje_object_part_external_object_get     (const Evas_Object *obj, const char *part);
    EAPI Eina_Bool                 edje_object_part_external_param_set      (Evas_Object *obj, const char *part, const Edje_External_Param *param);
    EAPI Eina_Bool                 edje_object_part_external_param_get      (const Evas_Object *obj, const char *part, Edje_External_Param *param);
-   EAPI Evas_Object                     *edje_object_part_external_content_get    (const Evas_Object *obj, const char *part, const char *content);
+   EAPI Evas_Object              *edje_object_part_external_content_get    (const Evas_Object *obj, const char *part, const char *content);
    EAPI Edje_External_Param_Type  edje_object_part_external_param_type_get (const Evas_Object *obj, const char *part, const char *param);
 
    EAPI Eina_Bool    edje_object_part_box_append             (Evas_Object *obj, const char *part, Evas_Object *child);

diff --git a/src/lib/Edje_Edit.h b/src/lib/Edje_Edit.h
index 22d948c..edba1ea 100644 (file)
--- a/src/lib/Edje_Edit.h
+++ b/src/lib/Edje_Edit.h
@@ -132,7 +132,7 @@ EAPI const char * edje_edit_compiler_get(Evas_Object *obj);
  *
  * @param obj Object to save back to the file it was loaded from.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  *
  * @todo Add a way to check what the error actually was, the way Edje Load does.
  */
@@ -142,7 +142,7 @@ EAPI Eina_Bool edje_edit_save(Evas_Object *obj);
  *
  * @param obj Object to save.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  *
  * @see edje_edit_save()
  */
@@ -173,7 +173,7 @@ EAPI void edje_edit_print_internal_status(Evas_Object *obj);
  * @param obj Object being edited.
  * @param name Name of the new group.
  *
- * @return EINA_TRUE if succesfully added the group, EINA_FALSE if an error
+ * @return EINA_TRUE if successfully added the group, EINA_FALSE if an error
  * occurred or if a group with the same name exists.
  */
 EAPI Eina_Bool edje_edit_group_add(Evas_Object *obj, const char *name);
@@ -187,7 +187,7 @@ EAPI Eina_Bool edje_edit_group_add(Evas_Object *obj, const char *name);
  * @param obj Object being edited.
  * @param group_name Name of group to delete.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_group_del(Evas_Object *obj, const char *group_name);
 
@@ -207,7 +207,7 @@ EAPI Eina_Bool edje_edit_group_exist(Evas_Object *obj, const char *group);
  * @param obj Object being edited.
  * @param new_name New name for the group.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_group_name_set(Evas_Object *obj, const char *new_name);
 
@@ -297,7 +297,7 @@ EAPI Eina_List * edje_edit_data_list_get(Evas_Object *obj);
  * @param itemname Name for the new data entry.
  * @param value Value for the new data entry.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_data_add(Evas_Object *obj, const char *itemname, const char *value);
 
@@ -356,7 +356,7 @@ EAPI Eina_List * edje_edit_group_data_list_get(Evas_Object *obj);
  * @param itemname Name for the new data entry.
  * @param value Value for the new data entry.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_group_data_add(Evas_Object *obj, const char *itemname, const char *value);
 
@@ -384,7 +384,7 @@ EAPI const char * edje_edit_group_data_value_get(Evas_Object *obj, char *itemnam
  * @param itemname Name of the data entry to set the value.
  * @param value Value to set for the data entry.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_group_data_value_set(Evas_Object *obj, const char *itemname, const char *value);
 
@@ -422,7 +422,7 @@ EAPI Eina_List * edje_edit_color_classes_list_get(Evas_Object *obj);
  * @param obj Object being edited.
  * @param name Name for the new color class.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_color_class_add(Evas_Object *obj, const char *name);
 
@@ -431,7 +431,7 @@ EAPI Eina_Bool edje_edit_color_class_add(Evas_Object *obj, const char *name);
  * @param obj Object being edited.
  * @param name Color class to delete.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_color_class_del(Evas_Object *obj, const char *name);
 
@@ -454,7 +454,7 @@ EAPI Eina_Bool edje_edit_color_class_del(Evas_Object *obj, const char *name);
  * @param b3 Blue component of tertiary color.
  * @param a3 Alpha component of tertiary color.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_color_class_colors_get(Evas_Object *obj, const char *class_name, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3);
 
@@ -477,7 +477,7 @@ EAPI Eina_Bool edje_edit_color_class_colors_get(Evas_Object *obj, const char *cl
  * @param b3 Blue component of tertiary color.
  * @param a3 Alpha component of tertiary color.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_color_class_colors_set(Evas_Object *obj, const char *class_name, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
 
@@ -487,7 +487,7 @@ EAPI Eina_Bool edje_edit_color_class_colors_set(Evas_Object *obj, const char *cl
  * @param name Color class to rename.
  * @param newname New name for the color class.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_color_class_name_set(Evas_Object *obj, const char *name, const char *newname);
 
@@ -516,7 +516,7 @@ EAPI Eina_List * edje_edit_styles_list_get(Evas_Object *obj);
  * @param obj Object being edited.
  * @param style Name for the new style.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_style_add(Evas_Object *obj, const char *style);
 
@@ -542,7 +542,7 @@ EAPI Eina_List * edje_edit_style_tags_list_get(Evas_Object *obj, const char *sty
  * @param style Style containing the tag being.
  * @param tag Tag to get the value for.
  *
- * @param Value of the given tag.
+ * @return Value of the given tag.
  */
 EAPI const char * edje_edit_style_tag_value_get(Evas_Object *obj, const char *style, const char *tag);
 
@@ -572,7 +572,7 @@ EAPI void edje_edit_style_tag_name_set(Evas_Object *obj, const char *style, cons
  * @param style Style where to add the new tag.
  * @param tag_name Name for the new tag.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_style_tag_add(Evas_Object *obj, const char *style, const char *tag_name);
 
@@ -645,7 +645,7 @@ EAPI Eina_List * edje_edit_parts_list_get(Evas_Object *obj);
  * @param name Name for the new part.
  * @param type Type of the new part. See @ref edcref for more info on this.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_add(Evas_Object *obj, const char *name, Edje_Part_Type type);
 
@@ -658,7 +658,7 @@ EAPI Eina_Bool edje_edit_part_add(Evas_Object *obj, const char *name, Edje_Part_
  * @param name Name for the new part.
  * @param source The registered external type to use for this part.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_external_add(Evas_Object *obj, const char *name, const char *source);
 
@@ -669,14 +669,14 @@ EAPI Eina_Bool edje_edit_part_external_add(Evas_Object *obj, const char *name, c
  * @param obj Object being edited.
  * @param part Name of part to delete.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_del(Evas_Object *obj, const char *part);
 
 /** Check if a part with the given name exist in the edje object.
  *
  * @param obj Object being edited.
- * @param part Name of part to check for its existance.
+ * @param part Name of part to check for its existence.
  *
  * @return EINA_TRUE if the part exists, EINA_FALSE if not.
  */
@@ -707,7 +707,7 @@ EAPI const char * edje_edit_part_below_get(Evas_Object *obj, const char *part);
  * @param obj Object being edited.
  * @param part Name of part to move one step below.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_restack_below(Evas_Object *obj, const char *part);
 
@@ -716,7 +716,7 @@ EAPI Eina_Bool edje_edit_part_restack_below(Evas_Object *obj, const char *part);
  * @param obj Object being edited.
  * @param part Name of part to move one step above.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_restack_above(Evas_Object *obj, const char *part);
 
@@ -728,7 +728,7 @@ EAPI Eina_Bool edje_edit_part_restack_above(Evas_Object *obj, const char *part);
  * @param part Name of part to rename.
  * @param new_name New name for the given part.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_name_set(Evas_Object *obj, const char *part, const char *new_name);
 
@@ -737,7 +737,7 @@ EAPI Eina_Bool edje_edit_part_name_set(Evas_Object *obj, const char *part, const
  * @param obj Object being edited.
  * @param part Name of the part.
  *
- * @return name of the api if succesful, NULL otherwise.
+ * @return name of the api if successful, NULL otherwise.
  */
 EAPI const char * edje_edit_part_api_name_get(Evas_Object *obj, const char *part);
 
@@ -746,7 +746,7 @@ EAPI const char * edje_edit_part_api_name_get(Evas_Object *obj, const char *part
  * @param obj Object being edited.
  * @param part Name of the part.
  *
- * @return description of the api if succesful, NULL otherwise.
+ * @return description of the api if successful, NULL otherwise.
  */
 EAPI const char * edje_edit_part_api_description_get(Evas_Object *obj, const char *part);
 
@@ -756,7 +756,7 @@ EAPI const char * edje_edit_part_api_description_get(Evas_Object *obj, const cha
  * @param part Name of the part.
  * @param name New name for the api property.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_api_name_set(Evas_Object *obj, const char *part, const char *name);
 
@@ -766,7 +766,7 @@ EAPI Eina_Bool edje_edit_part_api_name_set(Evas_Object *obj, const char *part, c
  * @param part Name of part.
  * @param description New description for the api property.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_api_description_set(Evas_Object *obj, const char *part, const char *description);
 
@@ -794,7 +794,7 @@ EAPI const char * edje_edit_part_clip_to_get(Evas_Object *obj, const char *part)
  * @param part Part to set the clipper to.
  * @param clip_to Part to use as clipper, if NULL then the clipping value will be cancelled (unset clipping).
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_clip_to_set(Evas_Object *obj, const char *part, const char *clip_to);
 
@@ -821,7 +821,7 @@ EAPI const char * edje_edit_part_source_get(Evas_Object *obj, const char *part);
  * @param part Part to set the source of.
  * @param source Value for the source parameter.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  *
  * @see edje_edit_part_source_get()
  *
@@ -868,7 +868,7 @@ EAPI const char * edje_edit_part_selected_state_get(Evas_Object *obj, const char
  * @param state Name of the state to set.
  * @param value Value of the state.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_selected_state_set(Evas_Object *obj, const char *part, const char *state, double value);
 
@@ -877,7 +877,7 @@ EAPI Eina_Bool edje_edit_part_selected_state_set(Evas_Object *obj, const char *p
  * @param obj Object being edited.
  * @param part Part to get if the mouse events is accepted.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_mouse_events_get(Evas_Object *obj, const char *part);
 
@@ -894,7 +894,7 @@ EAPI void edje_edit_part_mouse_events_set(Evas_Object *obj, const char *part, Ei
  * @param obj Object being edited.
  * @param part Part to set if will pass all events to the other parts.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_repeat_events_get(Evas_Object *obj, const char *part);
 
@@ -1021,7 +1021,7 @@ EAPI int edje_edit_part_drag_count_x_get(Evas_Object *obj, const char *part);
  *
  * @param obj Object being edited.
  * @param part Part to set the drag horizontal count value.
- * @aparam count The count value.
+ * @param count The count value.
  */
 EAPI void edje_edit_part_drag_count_x_set(Evas_Object *obj, const char *part, int count);
 
@@ -1036,7 +1036,7 @@ EAPI int edje_edit_part_drag_count_y_get(Evas_Object *obj, const char *part);
  *
  * @param obj Object being edited.
  * @param part Part to set the drag vertical count value.
- * @aparam count The count value.
+ * @param count The count value.
  */
 EAPI void edje_edit_part_drag_count_y_set(Evas_Object *obj, const char *part, int count);
 
@@ -1099,12 +1099,12 @@ EAPI Eina_List * edje_edit_part_states_list_get(Evas_Object *obj, const char *pa
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @oaram state Name of the state to rename.
+ * @param state Name of the state to rename.
  * @param value Value of the state to rename.
  * @param new_name The new name for the state.
  * @param new_value The new value for the state.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_name_set(Evas_Object *obj, const char *part, const char *state, double value, const char *new_name, double new_value);
 
@@ -1115,7 +1115,7 @@ EAPI Eina_Bool edje_edit_state_name_set(Evas_Object *obj, const char *part, cons
  * @param name Name for the new state (not including the state value).
  * @param value The state value.
  *
- * @return EINA_TRUE if succesfully, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successfully, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_add(Evas_Object *obj, const char *part, const char *name, double value);
 
@@ -1126,7 +1126,7 @@ EAPI Eina_Bool edje_edit_state_add(Evas_Object *obj, const char *part, const cha
  * @param state The current name of the state (not including the state value).
  * @param value The state value.
  *
- * @return EINA_TRUE if succesfully, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successfully, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_del(Evas_Object *obj, const char *part, const char *state, double value);
 
@@ -1150,7 +1150,7 @@ EAPI Eina_Bool edje_edit_state_exist(Evas_Object *obj, const char *part, const c
  * @param to State to copy into (not including state value).
  * @param val_to The value of the state to copy into.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_copy(Evas_Object *obj, const char *part, const char *from, double val_from, const char *to, double val_to);
 
@@ -1214,7 +1214,7 @@ EAPI void edje_edit_state_rel1_relative_x_set(Evas_Object *obj, const char *part
  * @param part Part that contain state.
  * @param state The name of the state to set 'rel1 relative Y' (not including the state value).
  * @param value The state value.
- * @param x The new 'rel1 relative Y' value to set'.
+ * @param y The new 'rel1 relative Y' value to set'.
  */
 EAPI void edje_edit_state_rel1_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y);
 
@@ -1234,7 +1234,7 @@ EAPI void edje_edit_state_rel2_relative_x_set(Evas_Object *obj, const char *part
  * @param part Part that contain state.
  * @param state The name of the state to set 'rel2 relative Y' (not including the state value).
  * @param value The state value.
- * @param x The new 'rel2 relative Y' value to set'.
+ * @param y The new 'rel2 relative Y' value to set'.
  */
 EAPI void edje_edit_state_rel2_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y);
 
@@ -1298,7 +1298,7 @@ EAPI void edje_edit_state_rel1_offset_x_set(Evas_Object *obj, const char *part,
  * @param part Part that contain state.
  * @param state The name of the state to set 'rel1 offset Y' (not including the state value).
  * @param value The state value.
- * @param x The new 'rel1 offset Y' value to set'.
+ * @param y The new 'rel1 offset Y' value to set'.
  */
 EAPI void edje_edit_state_rel1_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y);
 
@@ -1318,7 +1318,7 @@ EAPI void edje_edit_state_rel2_offset_x_set(Evas_Object *obj, const char *part,
  * @param part Part that contain state.
  * @param state The name of the state to set 'rel2 offset Y' (not including the state value).
  * @param value The state value.
- * @param x The new 'rel2 offset Y' value to set'.
+ * @param y The new 'rel2 offset Y' value to set'.
  */
 EAPI void edje_edit_state_rel2_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y);
 
@@ -1520,7 +1520,7 @@ EAPI double edje_edit_state_align_y_get(Evas_Object *obj, const char *part, cons
  * @param part Part that contain state.
  * @param state The name of the state to get horizontal align (not including the state value).
  * @param value The state value.
- * @param The new vertical align value.
+ * @param align The new vertical align value.
  */
 EAPI void edje_edit_state_align_x_set(Evas_Object *obj, const char *part, const char *state, double value,  double align);
 
@@ -1530,7 +1530,7 @@ EAPI void edje_edit_state_align_x_set(Evas_Object *obj, const char *part, const
  * @param part Part that contain state.
  * @param state The name of the state to get vertical align (not including the state value).
  * @param value The state value.
- * @param The new vertical align value.
+ * @param align The new vertical align value.
  */
 EAPI void edje_edit_state_align_y_set(Evas_Object *obj, const char *part, const char *state, double value,  double align);
 
@@ -1646,7 +1646,7 @@ EAPI double edje_edit_state_aspect_max_get(Evas_Object *obj, const char *part, c
  * @param part Part that contain state.
  * @param state The name of the state to set minimum aspect (not including the state value).
  * @param value The state value.
- * @param max_h Minimum aspect value.
+ * @param aspect Minimum aspect value.
  */
 EAPI void edje_edit_state_aspect_min_set(Evas_Object *obj, const char *part, const char *state, double value, double aspect);
 
@@ -1656,7 +1656,7 @@ EAPI void edje_edit_state_aspect_min_set(Evas_Object *obj, const char *part, con
  * @param part Part that contain state.
  * @param state The name of the state to set maximum aspect (not including the state value).
  * @param value The state value.
- * @param max_h Maximum aspect value.
+ * @param aspect Maximum aspect value.
  */
 EAPI void edje_edit_state_aspect_max_set(Evas_Object *obj, const char *part, const char *state, double value, double aspect);
 
@@ -1675,9 +1675,11 @@ EAPI unsigned char edje_edit_state_aspect_pref_get(Evas_Object *obj, const char
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @param state The name of the state to set aspect preference (not including the state value).
+ * @param state The name of the state to set aspect preference (not
+ *              including the state value).
  * @param value The state value.
- * @param The aspect preference to set (0 = None, 1 = Vertical, 2 = Horizontal, 3 = Both)
+ * @param pref The aspect preference to set (0 = None, 1 = Vertical, 2
+ *             = Horizontal, 3 = Both)
  */
 EAPI void edje_edit_state_aspect_pref_set(Evas_Object *obj, const char *part, const char *state, double value, unsigned char pref);
 
@@ -1791,7 +1793,8 @@ EAPI double edje_edit_state_fill_size_relative_y_get(Evas_Object *obj, const cha
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @param state The name of the state to get fill horizontal size offset relative to area (not including the state value).
+ * @param state The name of the state to get fill horizontal size
+ * offset relative to area (not including the state value).
  * @param value The state value.
  *
  * @return The fill horizontal size offset relative to area.
@@ -1802,7 +1805,8 @@ EAPI int edje_edit_state_fill_size_offset_x_get(Evas_Object *obj, const char *pa
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @param state The name of the state to get fill vertical size offset relative to area (not including the state value).
+ * @param state The name of the state to get fill vertical size offset
+ * relative to area (not including the state value).
  * @param value The state value.
  *
  * @return The fill vertical size offset relative to area.
@@ -1813,7 +1817,8 @@ EAPI int edje_edit_state_fill_size_offset_y_get(Evas_Object *obj, const char *pa
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @param state The name of the state to set fill horizontal size relative value (not including the state value).
+ * @param state The name of the state to set fill horizontal size
+ * relative value (not including the state value).
  * @param value The state value.
  * @param x The horizontal size relative value.
  */
@@ -1823,9 +1828,10 @@ EAPI void edje_edit_state_fill_size_relative_x_set(Evas_Object *obj, const char
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @param state The name of the state to set fill vertical size relative value (not including the state value).
+ * @param state The name of the state to set fill vertical size
+ * relative value (not including the state value).
  * @param value The state value.
- * @param y The vertical size relative value.
+ * @param x The vertical size relative value.
  */
 EAPI void edje_edit_state_fill_size_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double x);
 
@@ -1833,7 +1839,8 @@ EAPI void edje_edit_state_fill_size_relative_y_set(Evas_Object *obj, const char
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @param state The name of the state to set fill horizontal size offset relative value (not including the state value).
+ * @param state The name of the state to set fill horizontal size
+ * offset relative value (not including the state value).
  * @param value The state value.
  * @param x The horizontal size offset value.
  */
@@ -1843,7 +1850,8 @@ EAPI void edje_edit_state_fill_size_offset_x_set(Evas_Object *obj, const char *p
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @param state The name of the state to set fill vertical size offset relative value (not including the state value).
+ * @param state The name of the state to set fill vertical size offset
+ * relative value (not including the state value).
  * @param value The state value.
  * @param y The vertical size offset value.
  */
@@ -1929,7 +1937,7 @@ EAPI Eina_Bool edje_edit_state_external_param_get(Evas_Object *obj, const char *
  * @param param The name of the paramter.
  * @param val The value of the parameter.
  *
- * @return EINA_TRUE if sucessful. EINA_FALSE if not found or is of different type.
+ * @return EINA_TRUE if successful. EINA_FALSE if not found or is of different type.
  */
 EAPI Eina_Bool edje_edit_state_external_param_int_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, int *val);
 
@@ -1942,7 +1950,7 @@ EAPI Eina_Bool edje_edit_state_external_param_int_get(Evas_Object *obj, const ch
  * @param param The name of the paramter.
  * @param val The value of the parameter.
  *
- * @return EINA_TRUE if sucessful. EINA_FALSE if not found or is of different type.
+ * @return EINA_TRUE if successful. EINA_FALSE if not found or is of different type.
  */
 EAPI Eina_Bool edje_edit_state_external_param_bool_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, Eina_Bool *val);
 
@@ -1955,7 +1963,7 @@ EAPI Eina_Bool edje_edit_state_external_param_bool_get(Evas_Object *obj, const c
  * @param param The name of the paramter.
  * @param val The value of the parameter.
  *
- * @return EINA_TRUE if sucessful. EINA_FALSE if not found or is of different type.
+ * @return EINA_TRUE if successful. EINA_FALSE if not found or is of different type.
  */
 EAPI Eina_Bool edje_edit_state_external_param_double_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, double *val);
 
@@ -1963,12 +1971,14 @@ EAPI Eina_Bool edje_edit_state_external_param_double_get(Evas_Object *obj, const
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @param state The name of the state to get external parameter of type STRING (not including the state value).
+ * @param state The name of the state to get external parameter of
+ *              type STRING (not including the state value).
  * @param value The state value.
  * @param param The name of the paramter.
  * @param val The value of the parameter.
  *
- * @return EINA_TRUE if sucessful. EINA_FALSE if not found or is of different type.
+ * @return EINA_TRUE if successful. EINA_FALSE if not found or is of
+ * different type.
  */
 EAPI Eina_Bool edje_edit_state_external_param_string_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, const char **val);
 
@@ -2288,7 +2298,7 @@ EAPI Eina_Bool edje_edit_font_add(Evas_Object *obj, const char *path, const char
  * @param obj Object being edited.
  * @param alias The font alias
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise (including the
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise (including the
  * case when the alias is not valid).
  */
 EAPI Eina_Bool edje_edit_font_del(Evas_Object *obj, const char* alias);
@@ -2348,7 +2358,7 @@ EAPI Eina_List * edje_edit_images_list_get(Evas_Object *obj);
  * @param obj Object being edited.
  * @param path The name of the image file to include in the edje.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_image_add(Evas_Object *obj, const char *path);
 
@@ -2359,7 +2369,7 @@ EAPI Eina_Bool edje_edit_image_add(Evas_Object *obj, const char *path);
  * @param obj Object being edited.
  * @param name The name of the image file to include in the edje.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise (including the
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise (including the
  * case when the name is not valid).
  */
 EAPI Eina_Bool edje_edit_image_del(Evas_Object *obj, const char *name);
@@ -2376,7 +2386,7 @@ EAPI Eina_Bool edje_edit_image_del(Evas_Object *obj, const char *name);
  * @param name The image entry name.
  * @param id The image id.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_image_data_add(Evas_Object *obj, const char *name, int id);
 
@@ -2455,7 +2465,7 @@ EAPI void edje_edit_state_image_border_get(Evas_Object *obj, const char *part, c
  * @param l Left border value (or -1).
  * @param r Right border value (or -1).
  * @param t Top border value (or -1).
- * @param r Bottom border value (or -1).
+ * @param b Bottom border value (or -1).
  */
 EAPI void edje_edit_state_image_border_set(Evas_Object *obj, const char *part, const char *state, double value, int l, int r, int t, int b);
 
@@ -2507,7 +2517,7 @@ EAPI Eina_List * edje_edit_state_tweens_list_get(Evas_Object *obj, const char *p
  * @param value The state value.
  * @param tween The name of the image to add.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_tween_add(Evas_Object *obj, const char *part, const char *state, double value, const char *tween);
 
@@ -2521,7 +2531,7 @@ EAPI Eina_Bool edje_edit_state_tween_add(Evas_Object *obj, const char *part, con
  * @param value The state value.
  * @param tween The name of the image to del.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_tween_del(Evas_Object *obj, const char *part, const char *state, double value, const char *tween);
 
@@ -2980,10 +2990,10 @@ EAPI const char * edje_edit_program_source_get(Evas_Object *obj, const char *pro
 /** Set source of the given program.
  *
  * @param obj Object being edited.
- * @param program The name of the program to set source.
+ * @param prog The name of the program to set source.
  * @param source The new source value.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_source_set(Evas_Object *obj, const char *prog, const char *source);
 
@@ -3004,7 +3014,7 @@ EAPI const char * edje_edit_program_signal_get(Evas_Object *obj, const char *pro
  * @param prog The name of the program to set the signal.
  * @param signal The new signal value.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_signal_set(Evas_Object *obj, const char *prog, const char *signal);
 
@@ -3041,7 +3051,7 @@ EAPI double edje_edit_program_in_range_get(Evas_Object *obj, const char *prog);
  * @param prog The name of the program to set random delay.
  * @param seconds Max random number of seconds to delay.
  *
- * @returen EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_in_range_set(Evas_Object *obj, const char *prog, double seconds);
 
@@ -3063,7 +3073,7 @@ EAPI Edje_Action_Type edje_edit_program_action_get(Evas_Object *obj, const char
  * @param prog The name of the program to set the action.
  * @param action The new action type.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_action_set(Evas_Object *obj, const char *prog, Edje_Action_Type action);
 
@@ -3172,7 +3182,7 @@ edje_edit_program_haptic_name_set(
  * @param obj Object being edited.
  * @param prog The name of the program to clear the 'afters' list.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_afters_clear(Evas_Object *obj, const char *prog);
 
@@ -3193,7 +3203,7 @@ EAPI const char * edje_edit_program_state_get(Evas_Object *obj, const char *prog
  * @param obj Object being edited.
  * @param prog Name of program.
  *
- * @return name of the api if succesful, NULL otherwise.
+ * @return name of the api if successful, NULL otherwise.
  */
 EAPI const char * edje_edit_program_api_name_get(Evas_Object *obj, const char *prog);
 
@@ -3202,7 +3212,7 @@ EAPI const char * edje_edit_program_api_name_get(Evas_Object *obj, const char *p
  * @param obj Object being edited.
  * @param prog Name of program.
  *
- * @return description of the api if succesful, NULL otherwise.
+ * @return description of the api if successful, NULL otherwise.
  */
 EAPI const char * edje_edit_program_api_description_get(Evas_Object *obj, const char *prog);
 
@@ -3212,7 +3222,7 @@ EAPI const char * edje_edit_program_api_description_get(Evas_Object *obj, const
  * @param prog Name of the part.
  * @param name New name for the api property.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_api_name_set(Evas_Object *obj, const char *prog, const char *name);
 
@@ -3222,7 +3232,7 @@ EAPI Eina_Bool edje_edit_program_api_name_set(Evas_Object *obj, const char *prog
  * @param prog Name of the program.
  * @param description New description for the api property.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_api_description_set(Evas_Object *obj, const char *prog, const char *description);
 
@@ -3235,7 +3245,7 @@ EAPI Eina_Bool edje_edit_program_api_description_set(Evas_Object *obj, const cha
  * @param prog The name of the program to set a state.
  * @param state The nameo of the state to set (not including the state value)
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_state_set(Evas_Object *obj, const char *prog, const char *state);
 
@@ -3260,7 +3270,7 @@ EAPI double edje_edit_program_value_get(Evas_Object *obj, const char *prog);
  * @param prog The name of the program to set the value of state.
  * @param value The vale to set.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_value_set(Evas_Object *obj, const char *prog, double value);
 
@@ -3285,7 +3295,7 @@ EAPI const char * edje_edit_program_state2_get(Evas_Object *obj, const char *pro
  * @param prog The name of the program to set the state2.
  * @param state2 The name of the state to set.
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_state2_set(Evas_Object *obj, const char *prog, const char *state2);
 
@@ -3327,7 +3337,7 @@ EAPI Edje_Tween_Mode edje_edit_program_transition_get(Evas_Object *obj, const ch
  * @param prog The name of the program to set the transition.
  * @param transition The transition type to set
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_transition_set(Evas_Object *obj, const char *prog, Edje_Tween_Mode transition);
 
@@ -3346,7 +3356,7 @@ EAPI double edje_edit_program_transition_time_get(Evas_Object *obj, const char *
  * @param prog The name of the program to set the transition time.
  * @param seconds The duration of the transition (in seconds).
  *
- * @return EINA_TRUE if succesful, EINA_FALSE otherwise.
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_transition_time_set(Evas_Object *obj, const char *prog, double seconds);
 

diff --git a/src/lib/edje_cache.c b/src/lib/edje_cache.c
index 59d43d8..7a76429 100644 (file)
--- a/src/lib/edje_cache.c
+++ b/src/lib/edje_cache.c
@@ -162,7 +162,7 @@ _edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Co
        return NULL;
      }
 
-   if (edf->minor > EDJE_FILE_MINOR)  
+   if (edf->minor > EDJE_FILE_MINOR)
      {  
         WRN("`%s` may use feature from a newer edje and could not show up as expected.", file);  
      } 

diff --git a/src/lib/edje_data.c b/src/lib/edje_data.c
index 24a56bf..ddbf8c4 100644 (file)
--- a/src/lib/edje_data.c
+++ b/src/lib/edje_data.c
@@ -151,7 +151,7 @@ _edje_eina_hash_add_alloc(Eina_Hash  *hash,
    return hash;
 }
 
-// FIXME: remove EAPI wehn edje_convert goes 
+// FIXME: remove EAPI when edje_convert goes
 EAPI void
 _edje_edd_shutdown(void)
 {
@@ -219,7 +219,7 @@ _edje_edd_shutdown(void)
      EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_##Name##_pointer, Edje_##Type##_Pointer, "pointer", pointer, _edje_edd_edje_##Name); \
    }
 
-// FIXME: remove EAPI when edje_convert goes 
+// FIXME: remove EAPI when edje_convert goes
 EAPI void
 _edje_edd_init(void)
 {
@@ -774,7 +774,6 @@ _edje_edd_init(void)
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "source4", source4, EET_T_STRING);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "source5", source5, EET_T_STRING);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "source6", source6, EET_T_STRING);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "source7", source7, EET_T_STRING);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "id", id, EET_T_INT);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "clip_to_id", clip_to_id, EET_T_INT);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "dragable.x", dragable.x, EET_T_CHAR);

diff --git a/src/lib/edje_edit.c b/src/lib/edje_edit.c
index 9a71cd9..421156d 100644 (file)
--- a/src/lib/edje_edit.c
+++ b/src/lib/edje_edit.c
@@ -170,7 +170,7 @@ _edje_edit_smart_file_set(Evas_Object *obj, const char *file, const char *group)
     *    a group being used by the application in some other way, or multiple
     *    opens of the same file.
     *  * Here we probably want to allow opening groups with broken references
-    *    (GROUP parts or BOX/TABLE items pointing to non-existant/renamed
+    *    (GROUP parts or BOX/TABLE items pointing to non-existent/renamed
     *    groups).
     */
    return _edje_edit_parent_sc->file_set(obj, file, group);
@@ -1211,7 +1211,7 @@ edje_edit_compiler_get(Evas_Object *obj)
  * in memory, to the group set found in the .edj file which @a obj was
  * loaded with. This group can be manipulated by other API functions,
  * like @c edje_edit_part_add(), for example. If desired, the new
- * group can be actually commited the respective .edj by use of @c
+ * group can be actually committed the respective .edj by use of @c
  * edje_edit_save().
  *
  */

diff --git a/src/lib/edje_entry.c b/src/lib/edje_entry.c
index 66d52fb..5211bd5 100644 (file)
--- a/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@ -24,7 +24,6 @@ void *alloca (size_t);
 
 #include "edje_private.h"
 
-//#define USE_PREEDIT_BLOCK 1
 #ifdef HAVE_ECORE_IMF
 #include <Ecore_IMF_Evas.h>
 
@@ -3294,9 +3293,6 @@ _edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event)
            _backspace(en->cursor, rp->object, en);
         _sel_clear(en->cursor, rp->object, en);
 
-#ifdef USE_PREEDIT_BLOCK
-        _preedit_clear(en);
-#endif
         en->have_composition = EINA_FALSE;
      }
 
@@ -3381,104 +3377,14 @@ _edje_entry_imf_event_changed_cb(void *data, int type __UNUSED__, void *event)
         // delete the composing characters
         for (i = 0;i < en->comp_len; i++)
            _backspace(en->cursor, rp->object, en);
-
-#ifdef USE_PREEDIT_BLOCK
-        _preedit_clear(en);
-#endif /* USE_PREEDIT_BLOCK */
      }
 
    en->comp_len = length;
    en->have_composition = EINA_TRUE;
 
-#ifdef USE_PREEDIT_BLOCK
-   int preedit_start_pos = 0;
-
-   if (length)
-      preedit_start_pos = evas_textblock_cursor_pos_get(en->cursor);
-#endif /* USE_PREEDIT_BLOCK */
-
    //xx
    evas_object_textblock_text_markup_prepend(en->cursor, preedit_string);
 
-#ifdef USE_PREEDIT_BLOCK
-   if (length)
-     {
-        Evas_Textblock_Cursor *pre_start, *pre_end;
-        pre_start = evas_object_textblock_cursor_new(rp->object);
-        pre_end = evas_object_textblock_cursor_new(rp->object);
-
-        evas_textblock_cursor_copy(en->cursor, pre_start);
-        evas_textblock_cursor_copy(en->cursor, pre_end);
-
-        /* set preedit start as previous cursor position */
-        evas_textblock_cursor_pos_set(pre_start, preedit_start_pos);
-
-#if 0
-        const char *text = NULL;
-        text = evas_textblock_cursor_node_text_get(pre_start);
-        if (!text) 
-          {
-             text = evas_textblock_cursor_node_format_get (pre_start);
-             printf ("pre_start format node: %s\n", text);
-          }
-        else
-          {
-             printf ("pre_start text node: %s pos: %d\n", text, preedit_start_pos);
-          }
-
-        int preedit_end_pos = evas_textblock_cursor_pos_get(pre_end);
-        text = evas_textblock_cursor_node_text_get (pre_end);
-        if (!text) 
-          {
-             text = evas_textblock_cursor_node_format_get (pre_end);
-             printf ("pre_end format node: %s\n", text);
-          }
-        else
-          {
-             printf ("pre_end text node: %s pos: %d\n", text, end_pos);
-          }
-#endif
-
-        Eina_List *range = evas_textblock_cursor_range_geometry_get(pre_start, pre_end);
-
-        if (range)
-          {
-             Evas_Textblock_Rectangle *r;
-             Eina_List *l;
-             Evas_Coord x, y, w, h;
-
-             _preedit_clear(en);
-
-             evas_object_geometry_get(rp->object, &x, &y, &w, &h);
-
-             EINA_LIST_FOREACH(range, l, r)
-               {
-                  Evas_Object *obj;
-
-                  obj = edje_object_add(rp->edje->evas);
-                  edje_object_file_set(obj, rp->edje->path, rp->part->source7);
-                  evas_object_smart_member_add(obj, rp->edje->obj);
-                  evas_object_stack_below(obj, rp->object);
-                  evas_object_clip_set(obj, evas_object_clip_get(rp->object));
-                  evas_object_pass_events_set(obj, EINA_TRUE);
-                  rp->edje->subobjs = eina_list_append(rp->edje->subobjs, obj);
-                  evas_object_move(obj, x + r->x, y + r->y);
-                  evas_object_resize(obj, r->w, r->h);
-                  evas_object_show(obj);
-                  en->pre = eina_list_append(en->pre, obj);
-               }
-          }
-
-        while (range)
-          {
-             free(range->data);
-             range = eina_list_remove_list(range, range);
-          }
-        evas_textblock_cursor_free(pre_start);
-        evas_textblock_cursor_free(pre_end);
-     }
-#endif /* USE_PREEDIT_BLOCK */
-
    /*count characters*/                        
    if (en->func)
       en->func(en->data, NULL);

diff --git a/src/lib/edje_external.c b/src/lib/edje_external.c
index b25e21e..dbb87e1 100644 (file)
--- a/src/lib/edje_external.c
+++ b/src/lib/edje_external.c
@@ -312,11 +312,11 @@ edje_external_type_unregister(const char *type_name)
  *
  * @note the given array is not modified, but the type name strings
  *       are @b not duplicated! That is, all type names must be @b
- *       live until they are unregistered! This was choosen to save
+ *       live until they are unregistered! This was chosen to save
  *       some memory and most people will just define the array as a
  *       global static const type anyway.
  *
- * @param arrray @c NULL terminated array with type name and
+ * @param array @c NULL terminated array with type name and
  *        information. Note that type name or information are not
  *        modified by are @b referenced, so they must keep alive after
  *        this function returns!

diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index 56a4889..90f0e03 100644 (file)
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -682,7 +682,7 @@ struct _Edje_Part
 
    Edje_Part_Description_List    other; /* other possible descriptors */
 
-   const char           *source, *source2, *source3, *source4, *source5, *source6, *source7;
+   const char           *source, *source2, *source3, *source4, *source5, *source6;
    int                    id; /* its id number */
    int                    clip_to_id; /* the part id to clip this one to */
    Edje_Part_Dragable     dragable;
@@ -1381,7 +1381,7 @@ const Eina_List *edje_match_signal_source_hash_get(const char *signal,
                                                   const Eina_Rbtree *tree);
 void edje_match_signal_source_free(Edje_Signal_Source_Char *key, void *data);
 
-// FIXME remove below 2 eapi decls wehn edje_convert goes  
+// FIXME remove below 2 eapi decls when edje_convert goes  
 EAPI void _edje_edd_init(void);  
 EAPI void _edje_edd_shutdown(void); 
 

diff --git a/src/lib/edje_program.c b/src/lib/edje_program.c
index 23840da..3535376 100644 (file)
--- a/src/lib/edje_program.c
+++ b/src/lib/edje_program.c
@@ -704,9 +704,9 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig,
               }
             _edje_recalc(ed);
          }
-       break;
+        break;
      case EDJE_ACTION_TYPE_ACTION_STOP:
-        // _edje_emit(ed, "program,start", pr->name);  
+        // _edje_emit(ed, "program,start", pr->name);
         EINA_LIST_FOREACH(pr->targets, l, pt)
          {
             Eina_List *ll;

diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index 8cf116d..3236e6f 100644 (file)
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -190,7 +190,7 @@ edje_fontset_append_get(void)
 EAPI void
 edje_scale_set(double scale)
 {
-  Eina_List *l;
+   Eina_List *l;
    Evas_Object *data;
 
    if (_edje_scale == FROM_DOUBLE(scale)) return;
@@ -3024,7 +3024,7 @@ edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, E
  * @param restrictedw Do not allow object min width calc to be less than this
  * @param restrictedh Do not allow object min height calc to be less than this
  *
- * Calculates the object's minimum size ?! Be carefull the behaviour of this
+ * Calculates the object's minimum size ?! Be careful the behaviour of this
  * fonction is not really defined when a TEXTBLOCK part is present in the
  * Edje_Object. This may change in futur implementation.
  */
@@ -3405,8 +3405,8 @@ edje_object_part_drag_size_get(const Evas_Object *obj, const char *part, double
  *
  * @param obj A valid Evas_Object handle
  * @param part The part name
- * @param dx The x step ammount
- * @param dy The y step ammount
+ * @param dx The x step amount
+ * @param dy The y step amount
  *
  * Sets the x,y step increments for a dragable object.
  */
@@ -3649,7 +3649,7 @@ _edje_box_shutdown(void)
  * @param child The object to append
  *
  * @return 1: Successfully added.\n
- * 0: An error occured.
+ * 0: An error occurred.
  *
  * Appends child to the box indicated by part.
  */
@@ -3677,7 +3677,7 @@ edje_object_part_box_append(Evas_Object *obj, const char *part, Evas_Object *chi
  * @param child The object to prepend
  *
  * @return 1: Successfully added.\n
- * 0: An error occured.
+ * 0: An error occurred.
  *
  * Prepends child to the box indicated by part.
  */
@@ -3706,7 +3706,7 @@ edje_object_part_box_prepend(Evas_Object *obj, const char *part, Evas_Object *ch
  * @param reference The object to be used as reference
  *
  * @return 1: Successfully added.\n
- * 0: An error occured.
+ * 0: An error occurred.
  *
  * Inserts child in the box given by part, in the position marked by
  * reference.
@@ -3736,7 +3736,7 @@ edje_object_part_box_insert_before(Evas_Object *obj, const char *part, Evas_Obje
  * @param pos The position where to insert child
  *
  * @return 1: Successfully added.\n
- * 0: An error occured.
+ * 0: An error occurred.
  *
  * Adds child to the box indicated by part, in the position given by
  * pos.
@@ -3820,7 +3820,7 @@ edje_object_part_box_remove_at(Evas_Object *obj, const char *part, unsigned int
  * @param clear Delete objects on removal
  *
  * @return 1: Successfully cleared.\n
- * 0: An error occured.
+ * 0: An error occurred.
  *
  * Removes all the external objects from the box indicated by part.
  * Elements created from the theme will not be removed.
@@ -4058,7 +4058,7 @@ edje_object_part_table_child_get(Evas_Object *obj, const char *part, unsigned in
  * @param rowspan Rows the child will take
  *
  * @return 1: Successfully added.\n
- * 0: An error occured.
+ * 0: An error occurred.
  *
  * Packs an object into the table indicated by part.
  */
@@ -4086,7 +4086,7 @@ edje_object_part_table_pack(Evas_Object *obj, const char *part, Evas_Object *chi
  * @param child_obj The object to pack in
  *
  * @return 1: Successfully removed.\n
- * 0: An error occured.
+ * 0: An error occurred.
  *
  * Removes an object from the table indicated by part.
  */
@@ -4115,7 +4115,7 @@ edje_object_part_table_unpack(Evas_Object *obj, const char *part, Evas_Object *c
  * @param rows Pointer where to store number of rows (can be NULL)
  *
  * @return 1: Successfully get some data.\n
- * 0: An error occured.
+ * 0: An error occurred.
  *
  * Retrieves the size of the table in number of columns and rows.
  */
@@ -4144,7 +4144,7 @@ edje_object_part_table_col_row_size_get(const Evas_Object *obj, const char *part
  * @param clear If set, will delete subobjs on remove
  *
  * @return 1: Successfully clear table.\n
- * 0: An error occured.
+ * 0: An error occurred.
  *
  * Removes all object from the table indicated by part, except the
  * internal ones set from the theme.