10 files changed, 210 insertions, 185 deletions

diff --git a/libraries/edje/src/bin/Makefile.in b/libraries/edje/src/bin/Makefile.in
index 877bcb2..07bf025 100644
--- a/libraries/edje/src/bin/Makefile.in
+++ b/libraries/edje/src/bin/Makefile.in
@@ -291,8 +291,6 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/bin/edje_cc.h b/libraries/edje/src/bin/edje_cc.h
index bcd31a1..d0c6d22 100644
--- a/libraries/edje/src/bin/edje_cc.h
+++ b/libraries/edje/src/bin/edje_cc.h
@@ -138,6 +138,7 @@ struct _Edje_Part_Parser
 /* global fn calls */
 void    data_setup(void);
 void    data_write(void);
+void    data_queue_group_lookup(const char *name, Edje_Part *part);
 void    data_queue_part_lookup(Edje_Part_Collection *pc, const char *name, int *dest);
 void    data_queue_copied_part_lookup(Edje_Part_Collection *pc, int *src, int *dest);
 void    data_queue_program_lookup(Edje_Part_Collection *pc, const char *name, int *dest);
diff --git a/libraries/edje/src/bin/edje_cc_handlers.c b/libraries/edje/src/bin/edje_cc_handlers.c
index 8bfc262..f74fa12 100644
--- a/libraries/edje/src/bin/edje_cc_handlers.c
+++ b/libraries/edje/src/bin/edje_cc_handlers.c
@@ -172,6 +172,7 @@ static void st_collections_group_parts_part_description_visible(void);
 static void st_collections_group_parts_part_description_align(void);
 static void st_collections_group_parts_part_description_fixed(void);
 static void st_collections_group_parts_part_description_min(void);
+static void st_collections_group_parts_part_description_minmul(void);
 static void st_collections_group_parts_part_description_max(void);
 static void st_collections_group_parts_part_description_step(void);
 static void st_collections_group_parts_part_description_aspect(void);
@@ -261,12 +262,9 @@ static void st_collections_group_programs_program_after(void);
 static void st_collections_group_programs_program_api(void);
 
 static void ob_collections_group_programs_program_script(void);
-
-#ifdef ENABLE_MULTISENSE
 static void st_collections_group_sound_sample_name(void);
 static void st_collections_group_sound_sample_source(void);
 static void st_collections_group_sound_tone(void);
-#endif
 
 /*****/
 
@@ -305,14 +303,13 @@ New_Statement_Handler statement_handlers[] =
      {"collections.color_classes.color_class.color", st_color_class_color}, /* dup */
      {"collections.color_classes.color_class.color2", st_color_class_color2}, /* dup */
      {"collections.color_classes.color_class.color3", st_color_class_color3}, /* dup */
-#ifdef ENABLE_MULTISENSE
+
      {"collections.sounds.sample.name", st_collections_group_sound_sample_name},
      {"collections.sounds.sample.source", st_collections_group_sound_sample_source},
      {"collections.group.sounds.sample.name", st_collections_group_sound_sample_name}, /* dup */
      {"collections.group.sounds.sample.source", st_collections_group_sound_sample_source}, /* dup */
      {"collections.sounds.tone", st_collections_group_sound_tone},
      {"collections.group.sounds.tone", st_collections_group_sound_tone}, /* dup */
-#endif
      {"collections.group.name", st_collections_group_name},
      {"collections.group.inherit", st_collections_group_inherit},
      {"collections.group.script_only", st_collections_group_script_only},
@@ -438,6 +435,7 @@ New_Statement_Handler statement_handlers[] =
      {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align},
      {"collections.group.parts.part.description.fixed", st_collections_group_parts_part_description_fixed},
      {"collections.group.parts.part.description.min", st_collections_group_parts_part_description_min},
+     {"collections.group.parts.part.description.minmul", st_collections_group_parts_part_description_minmul},
      {"collections.group.parts.part.description.max", st_collections_group_parts_part_description_max},
      {"collections.group.parts.part.description.step", st_collections_group_parts_part_description_step},
      {"collections.group.parts.part.description.aspect", st_collections_group_parts_part_description_aspect},
@@ -677,14 +675,13 @@ New_Object_Handler object_handlers[] =
      {"collections.styles.style", ob_styles_style}, /* dup */
      {"collections.color_classes", NULL}, /* dup */
      {"collections.color_classes.color_class", ob_color_class}, /* dup */
-#ifdef ENABLE_MULTISENSE
      {"collections.sounds", NULL},
      {"collections.group.sounds", NULL}, /* dup */
      {"collections.sounds.sample", NULL},
      {"collections.group.sounds.sample", NULL}, /* dup */
-#endif
      {"collections.group", ob_collections_group},
      {"collections.group.data", NULL},
+     {"collections.group.limits", NULL},
      {"collections.group.script", ob_collections_group_script},
      {"collections.group.lua_script", ob_collections_group_lua_script},
      {"collections.group.externals", NULL}, /* dup */
@@ -1836,12 +1833,6 @@ st_styles_style_tag(void)
    stl->tags = eina_list_append(stl->tags, tag);
 }
 
-#ifdef ENABLE_MULTISENSE
-/* add to below doc
-sounds { }
- */
-#endif
-
 /**
     @page edcref
     @block
@@ -1851,6 +1842,7 @@ sounds { }
             ..
             group { }
             group { }
+            sounds { }
             ..
         }
     @description
@@ -1866,8 +1858,7 @@ ob_collections(void)
      edje_file->collection = eina_hash_string_small_new(NULL);
 }
 
-#ifdef ENABLE_MULTISENSE
-/* * delete space before *
+/**
     @page edcref
     @block
         sounds
@@ -1980,7 +1971,7 @@ st_collections_group_sound_sample_name(void)
 
 }
 
-/* * delete space before *
+/**
     @page edcref
     @property
         source
@@ -2016,7 +2007,7 @@ st_collections_group_sound_sample_source(void)
    check_arg_count(1);
 }
 
-/* * delete space before *
+/**
     @page edcref
     @property
         tone
@@ -2079,7 +2070,6 @@ st_collections_group_sound_tone(void)
    tone->value = value;
    tone->id = edje_file->sound_dir->tones_count - 1;
 }
-#endif
 
 /**
    @edcsection{group,Group sub blocks}
@@ -2677,14 +2667,14 @@ st_collections_group_orientation(void)
     @block
         limits
     @context
-        group {
+        group {
             limits {
-                vertical: "limit_name" height_barrier;
-                horizontal: "limit_name" width_barrier;
-                ..
-            }
-            ..
-        }
+                vertical: "limit_name" height_barrier;
+                horizontal: "limit_name" width_barrier;
+                ..
+            }
+            ..
+        }
         ..
     @description
         This block is used to trigger some signal when the Edje object is resized.
@@ -2696,10 +2686,10 @@ st_collections_group_orientation(void)
     @parameters
         [name] [height barrier]
     @effect
-        It will send a signal: "limit,name,over" when the object is resized and pass
-        the limit by growing over it. And it will send: "limit,name,below" when
-        it pass below that limit.
-        This limit will be applied on the y absis.
+        It will send a signal: "limit,name,over" when the object is resized and pass
+        the limit by growing over it. And it will send: "limit,name,below" when
+        it pass below that limit.
+        This limit will be applied on the y absis and is expressed in pixels.
     @endproperty
 */
 static void
@@ -2734,10 +2724,10 @@ st_collections_group_limits_vertical(void)
     @parameters
         [name] [width barrier]
     @effect
-        It will send a signal: "limit,name,over" when the object is resized and pass
-        the limit by growing over it. And it will send: "limit,name,below" when
-        it pass below that limit.
-        This limit will be applied on the x absis.
+        It will send a signal: "limit,name,over" when the object is resized and pass
+        the limit by growing over it. And it will send: "limit,name,below" when
+        it pass below that limit.
+        This limit will be applied on the x absis and is expressed in pixels.
     @endproperty
 */
 static void
@@ -3224,6 +3214,7 @@ st_collections_group_parts_part_source(void)
 
    //FIXME: validate this somehow (need to decide on the format also)
    current_part->source = parse_str(0);
+   data_queue_group_lookup(current_part->source, current_part);
 }
 
 /**
@@ -3245,6 +3236,7 @@ st_collections_group_parts_part_source2(void)
 
    //FIXME: validate this somehow (need to decide on the format also)
    current_part->source2 = parse_str(0);
+   data_queue_group_lookup(current_part->source2, current_part);
 }
 
 /**
@@ -3266,6 +3258,7 @@ st_collections_group_parts_part_source3(void)
 
    //FIXME: validate this somehow (need to decide on the format also)
    current_part->source3 = parse_str(0);
+   data_queue_group_lookup(current_part->source3, current_part);
 }
 
 /**
@@ -3287,6 +3280,7 @@ st_collections_group_parts_part_source4(void)
 
    //FIXME: validate this somehow (need to decide on the format also)
    current_part->source4 = parse_str(0);
+   data_queue_group_lookup(current_part->source4, current_part);
 }
 
 /**
@@ -3308,6 +3302,7 @@ st_collections_group_parts_part_source5(void)
 
    //FIXME: validate this somehow (need to decide on the format also)
    current_part->source5 = parse_str(0);
+   data_queue_group_lookup(current_part->source5, current_part);
 }
 
 /**
@@ -3329,6 +3324,7 @@ st_collections_group_parts_part_source6(void)
 
    //FIXME: validate this somehow (need to decide on the format also)
    current_part->source6 = parse_str(0);
+   data_queue_group_lookup(current_part->source6, current_part);
 }
 
 /**
@@ -3439,10 +3435,9 @@ st_collections_group_parts_part_entry_mode(void)
         [MODE]
     @effect
         Sets the selection mode for a textblock part to one of:
-        @li DEFAULT
-        @li EXPLICIT
-        DEFAULT selection mode is what you would expect on any desktop. Press
-        mouse, drag and release to end. EXPLICIT mode requires the application
+        @li DEFAULT selection mode is what you would expect on any desktop. Press
+        mouse, drag and release to end.
+        @li EXPLICITmode requires the application
         controlling the edje object has to explicitly begin and end selection
         modes, and the selection itself is dragable at both ends.
     @endproperty
@@ -3466,11 +3461,9 @@ st_collections_group_parts_part_select_mode(void)
         [MODE]
     @effect
         Sets the cursor mode for a textblock part to one of:
-        @li UNDER
-        @li BEFORE
-        UNDER cursor mode means the cursor will draw below the character pointed
+        @li UNDER cursor mode means the cursor will draw below the character pointed
         at. That's the default.
-        BEFORE cursor mode means the cursor is drawn as a vertical line before
+        @li BEFORE cursor mode means the cursor is drawn as a vertical line before
         the current character, just like many other GUI toolkits handle it.
     @endproperty
 */
@@ -3816,6 +3809,7 @@ static void st_collections_group_parts_part_box_items_item_source(void)
    check_arg_count(1);
 
    current_item->source = parse_str(0);
+   data_queue_group_lookup(current_item->source, current_part);
 }
 
 /**
@@ -4140,6 +4134,9 @@ ob_collections_group_parts_part_description(void)
    ed->map.persp_on = 0;
    ed->persp.zplane = 0;
    ed->persp.focal = 1000;
+   ed->minmul.have = 1;
+   ed->minmul.w = FROM_INT(1);
+   ed->minmul.h = FROM_INT(1);
 }
 
 /**
@@ -4558,6 +4555,27 @@ st_collections_group_parts_part_description_min(void)
 /**
     @page edcref
     @property
+        minmul
+    @parameters
+        [width multipler] [height multiplier]
+    @effect
+        A multiplier FORCIBLY applied to whatever minimum size is only during
+        minimum size calculation.
+    @endproperty
+    @since 1.2
+*/
+static void
+st_collections_group_parts_part_description_minmul(void)
+{
+   check_arg_count(2);
+
+   current_desc->minmul.w = FROM_DOUBLE(parse_float_range(0, 0, 999999));
+   current_desc->minmul.h = FROM_DOUBLE(parse_float_range(1, 0, 999999));
+}
+
+/**
+    @page edcref
+    @property
         max
     @parameters
         [width] [height]
@@ -4605,7 +4623,7 @@ st_collections_group_parts_part_description_step(void)
         Normally width and height can be resized to any values independently.
         The aspect property forces the width to height ratio to be kept between
         the minimum and maximum set. For example, "1.0 1.0" will increase the
-        width a pixel for every pixel added to heigh. The default value is
+        width a pixel for every pixel added to height. The default value is
         "0.0 0.0" disabling aspect.
     @endproperty
 */
@@ -4626,7 +4644,7 @@ st_collections_group_parts_part_description_aspect(void)
         [DIMENSION]
     @effect
         Sets the scope of the "aspect" property to a given dimension. Available
-        options are BOTH, VERTICAL, HORIZONTAL and NONE
+        options are BOTH, VERTICAL, HORIZONTAL, SOURCE and NONE
     @endproperty
 */
 static void
@@ -4639,6 +4657,7 @@ st_collections_group_parts_part_description_aspect_preference(void)
                                    "VERTICAL", EDJE_ASPECT_PREFER_VERTICAL,
                                    "HORIZONTAL", EDJE_ASPECT_PREFER_HORIZONTAL,
                                    "BOTH", EDJE_ASPECT_PREFER_BOTH,
+                                   "SOURCE", EDJE_ASPECT_PREFER_SOURCE,
                                    NULL);
 }
 
@@ -7236,15 +7255,6 @@ st_collections_group_programs_program_in(void)
    current_program->in.range = parse_float_range(1, 0.0, 999999999.0);
 }
 
-#ifdef ENABLE_MULTISENSE
-/* add to docs below
-, PLAY_SAMPLE, PLAY_TONE
-
-           action: PLAY_SAMPLE "sample name";\n
-           action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n
-*/
-#endif
-
 /**
     @page edcref
     @property
@@ -7254,7 +7264,7 @@ st_collections_group_programs_program_in(void)
     @effect
         Action to be performed by the program. Valid actions are: STATE_SET,
         ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, DRAG_VAL_STEP, DRAG_VAL_PAGE,
-        FOCUS_SET, PARAM_COPY, PARAM_SET
+        FOCUS_SET, PARAM_COPY, PARAM_SET, PLAY_SAMPLE, PLAY_TONE
         Only one action can be specified per program. Examples:\n
            action: STATE_SET "statename" 0.5;\n
            action: ACTION_STOP;\n
@@ -7266,6 +7276,8 @@ st_collections_group_programs_program_in(void)
            action: FOCUS_OBJECT;\n
            action: PARAM_COPY "src_part" "src_param" "dst_part" "dst_param";\n
            action: PARAM_SET "part" "param" "value";\n
+           action: PLAY_SAMPLE "sample name";\n
+           action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n
     @endproperty
 */
 static void
@@ -7273,6 +7285,7 @@ st_collections_group_programs_program_action(void)
 {
    Edje_Part_Collection *pc;
    Edje_Program *ep;
+   int i;
    
    pc = eina_list_data_get(eina_list_last(edje_collections));
    ep = current_program;
@@ -7288,10 +7301,8 @@ st_collections_group_programs_program_action(void)
                            "FOCUS_OBJECT", EDJE_ACTION_TYPE_FOCUS_OBJECT,
                            "PARAM_COPY", EDJE_ACTION_TYPE_PARAM_COPY,
                            "PARAM_SET", EDJE_ACTION_TYPE_PARAM_SET,
-#ifdef ENABLE_MULTISENSE
                            "PLAY_SAMPLE", EDJE_ACTION_TYPE_SOUND_SAMPLE,
                            "PLAY_TONE", EDJE_ACTION_TYPE_SOUND_TONE,
-#endif
                            NULL);
    if (ep->action == EDJE_ACTION_TYPE_STATE_SET)
      {
@@ -7303,11 +7314,8 @@ st_collections_group_programs_program_action(void)
         ep->state = parse_str(1);
         ep->state2 = parse_str(2);
      }
-#ifdef ENABLE_MULTISENSE
    else if (ep->action == EDJE_ACTION_TYPE_SOUND_SAMPLE)
      {
-        int i;
-        
         ep->sample_name = parse_str(1);
         for (i = 0; i < (int)edje_file->sound_dir->samples_count; i++)
           {
@@ -7324,8 +7332,6 @@ st_collections_group_programs_program_action(void)
      }
    else if (ep->action == EDJE_ACTION_TYPE_SOUND_TONE)
      {
-        int i;
-        
         ep->tone_name = parse_str(1);
         for (i = 0; i < (int)edje_file->sound_dir->tones_count; i++)
           {
@@ -7340,7 +7346,6 @@ st_collections_group_programs_program_action(void)
           }
         ep->duration = parse_float_range(2, 0.1, 10.0);
      }
-#endif   
    else if (ep->action == EDJE_ACTION_TYPE_DRAG_VAL_SET)
      {
         ep->value = parse_float(1);
@@ -7402,14 +7407,12 @@ st_collections_group_programs_program_action(void)
       case EDJE_ACTION_TYPE_PARAM_SET:
         check_arg_count(4);
         break;
-#ifdef ENABLE_MULTISENSE
       case EDJE_ACTION_TYPE_SOUND_SAMPLE:
         check_arg_count(3);
         break;
       case EDJE_ACTION_TYPE_SOUND_TONE:
         check_arg_count(3);
         break;
-#endif        
       default:
         check_arg_count(3);
      }
diff --git a/libraries/edje/src/bin/edje_cc_out.c b/libraries/edje/src/bin/edje_cc_out.c
index 443a702..5050ad4 100644
--- a/libraries/edje/src/bin/edje_cc_out.c
+++ b/libraries/edje/src/bin/edje_cc_out.c
@@ -72,6 +72,7 @@ struct _Program_Lookup
 struct _Group_Lookup
 {
    char *name;
+   Edje_Part *part;
 };
 
 struct _String_Lookup
@@ -808,8 +809,8 @@ data_write_groups(Eet_File *ef, int *collection_num)
 
         if (verbose)
           {
-             printf("%s: Wrote %9i bytes (%4iKb) for \"%s\" collection entry\n",
-                    progname, bytes, (bytes + 512) / 1024, buf);
+             printf("%s: Wrote %9i bytes (%4iKb) for \"%s\" aka \"%s\" collection entry\n",
+                    progname, bytes, (bytes + 512) / 1024, buf, pc->part);
           }
      }
 
@@ -1371,13 +1372,16 @@ reorder_parts(void)
 }
 
 void
-data_queue_group_lookup(char *name)
+data_queue_group_lookup(const char *name, Edje_Part *part)
 {
    Group_Lookup *gl;
 
+   if (!name || !name[0]) return;
+
    gl = mem_alloc(SZ(Group_Lookup));
    group_lookups = eina_list_append(group_lookups, gl);
    gl->name = mem_strdup(name);
+   gl->part = part;
 }
 
 void
@@ -1698,15 +1702,38 @@ data_process_lookups(void)
      {
         Edje_Part_Collection_Directory_Entry *de;
 
+        if (group->part)
+          {
+            if (group->part->type != EDJE_PART_TYPE_GROUP
+                && group->part->type != EDJE_PART_TYPE_TEXTBLOCK
+                && group->part->type != EDJE_PART_TYPE_BOX
+                && group->part->type != EDJE_PART_TYPE_TABLE)
+              goto free_group;
+          }
+
         de = eina_hash_find(edje_file->collection, group->name);
 
         if (!de)
+          {
+             Eina_Bool found = EINA_FALSE;
+
+             EINA_LIST_FOREACH(aliases, l, de)
+               if (strcmp(de->entry, group->name) == 0)
+                 {
+                    found = EINA_TRUE;
+                    break;
+                 }
+             if (!found) de = NULL;
+          }
+
+        if (!de)
           {
              ERR("%s: Error. Unable to find group name \"%s\".",
                  progname, group->name);
              exit(-1);
           }
 
+     free_group:
         free(group->name);
         free(group);
      }
@@ -1914,7 +1941,7 @@ _data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int
 static void
 _data_queue_group_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr __UNUSED__, int len __UNUSED__)
 {
-   data_queue_group_lookup(name);
+   data_queue_group_lookup(name, NULL);
 }
 static void
 _data_queue_image_pc_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr, int len)
diff --git a/libraries/edje/src/bin/edje_cc_parse.c b/libraries/edje/src/bin/edje_cc_parse.c
index ae68e00..adc08d3 100644
--- a/libraries/edje/src/bin/edje_cc_parse.c
+++ b/libraries/edje/src/bin/edje_cc_parse.c
@@ -238,8 +238,6 @@ next_token(char *p, char *end, char **new_p, int *delim)
    int in_comment_sa  = 0;
    int had_quote = 0;
    int is_escaped = 0;
-   char *cpp_token_line = NULL;
-   char *cpp_token_file = NULL;
 
    *delim = 0;
    if (p >= end) return NULL;
@@ -249,8 +247,6 @@ next_token(char *p, char *end, char **new_p, int *delim)
           {
              in_comment_ss = 0;
              in_comment_cpp = 0;
-             cpp_token_line = NULL;
-             cpp_token_file = NULL;
              line++;
           }
         if ((!in_comment_ss) && (!in_comment_sa))
@@ -275,8 +271,6 @@ next_token(char *p, char *end, char **new_p, int *delim)
              /* their line format is
               * #line <line no. of next line> <filename from next line on> [??]
               */
-             cpp_token_line = NULL;
-             cpp_token_file = NULL;
 
              pp = p;
              while ((pp < end) && (*pp != '\n'))
diff --git a/libraries/edje/src/bin/edje_decc.c b/libraries/edje/src/bin/edje_decc.c
index 1b79e13..ac776e9 100644
--- a/libraries/edje/src/bin/edje_decc.c
+++ b/libraries/edje/src/bin/edje_decc.c
@@ -69,7 +69,6 @@ main(int argc, char **argv)
        eina_shutdown();
        exit(-1);
      }
-   eina_log_level_set(EINA_LOG_LEVEL_INFO);
    progname = argv[0];
    for (i = 1; i < argc; i++)
      {
@@ -104,7 +103,7 @@ main(int argc, char **argv)
    if (!decomp()) return -1;
    output();
 
-   printf("WARNING! If any Image or audio data was encoded in a LOSSY way, then\n"
+   fprintf(stderr, "WARNING! If any Image or audio data was encoded in a LOSSY way, then\n"
           "re-encoding will drop quality even more. You need access to the original\n"
           "data to ensure no loss of quality.\n");
    eet_close(ef);
diff --git a/libraries/edje/src/bin/edje_inspector.c b/libraries/edje/src/bin/edje_inspector.c
index ed3baaf..093de86 100644
--- a/libraries/edje/src/bin/edje_inspector.c
+++ b/libraries/edje/src/bin/edje_inspector.c
@@ -263,20 +263,20 @@ border_fill_name_get(int id)
 }
 
 static void
-state_details(Evas_Object *ed, const char *part, const char *state, double value)
+state_details(Evas_Object *ed, const char *ppart, const char *state, double value)
 {
-   Edje_Part_Type t = edje_edit_part_type_get(ed, part);
+   Edje_Part_Type t = edje_edit_part_type_get(ed, ppart);
    double dx, dy;
    const char *str, *str2;
    int x, y, r, g, b, a;
 
    if (detail < 1) return;
 
-   b = edje_edit_state_visible_get(ed, part, state, value);
+   b = edje_edit_state_visible_get(ed, ppart, state, value);
    if (machine) printf("VISIBLE: %d\n", b);
    else if (!b) puts(INDENT4 "visible: 0;");
 
-   edje_edit_state_color_get(ed, part, state, value, &r, &g, &b, &a);
+   edje_edit_state_color_get(ed, ppart, state, value, &r, &g, &b, &a);
    if (machine)
      printf("COLOR-R: %d\nCOLOR-G: %d\nCOLOR-B: %d\nCOLOR-A: %d\n", r, g, b, a);
    else if ((r != 255) || (g != 255) || (b != 255) || (a != 255))
@@ -284,14 +284,14 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
 
    if (detail > 1)
      {
-        edje_edit_state_color2_get(ed, part, state, value, &r, &g, &b, &a);
+        edje_edit_state_color2_get(ed, ppart, state, value, &r, &g, &b, &a);
         if (machine)
           printf("COLOR2-R: %d\nCOLOR2-G: %d\nCOLOR2-B: %d\nCOLOR2-A: %d\n",
                  r, g, b, a);
         else if ((r != 255) || (g != 255) || (b != 255) || (a != 255))
           printf(INDENT4 "color2: %d %d %d %d;\n", r, g, b, a);
 
-        edje_edit_state_color3_get(ed, part, state, value, &r, &g, &b, &a);
+        edje_edit_state_color3_get(ed, ppart, state, value, &r, &g, &b, &a);
         if (machine)
           printf("COLOR3-R: %d\nCOLOR3-G: %d\nCOLOR3-B: %d\nCOLOR3-A: %d\n",
                  r, g, b, a);
@@ -299,19 +299,19 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
           printf(INDENT4 "color3: %d %d %d %d;\n", r, g, b, a);
      }
 
-   dx = edje_edit_state_align_x_get(ed, part, state, value);
-   dy = edje_edit_state_align_y_get(ed, part, state, value);
+   dx = edje_edit_state_align_x_get(ed, ppart, state, value);
+   dy = edje_edit_state_align_y_get(ed, ppart, state, value);
    if (machine) printf("ALIGN-X: %g\nALIGN-Y: %g\n", dx, dy);
    else if (FDIFF(dx, 0.5) || FDIFF(dy, 0.5))
      printf(INDENT4 "align: %g %g;\n", dx, dy);
 
-   x = edje_edit_state_min_w_get(ed, part, state, value);
-   y = edje_edit_state_min_h_get(ed, part, state, value);
+   x = edje_edit_state_min_w_get(ed, ppart, state, value);
+   y = edje_edit_state_min_h_get(ed, ppart, state, value);
    if (machine) printf("MIN-W: %d\nMIN-H: %d\n", x, y);
    else if ((x) || (y)) printf(INDENT4 "min: %d %d;\n", x, y);
 
-   x = edje_edit_state_max_w_get(ed, part, state, value);
-   y = edje_edit_state_max_h_get(ed, part, state, value);
+   x = edje_edit_state_max_w_get(ed, ppart, state, value);
+   y = edje_edit_state_max_h_get(ed, ppart, state, value);
    if (machine) printf("MAX-W: %d\nMAX-H: %d\n", x, y);
    else if ((x != -1) || (y != -1)) printf(INDENT4 "max: %d %d;\n", x, y);
 
@@ -320,30 +320,30 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
 
    if (detail > 1)
      {
-        dx = edje_edit_state_aspect_min_get(ed, part, state, value);
-        dy = edje_edit_state_aspect_max_get(ed, part, state, value);
+        dx = edje_edit_state_aspect_min_get(ed, ppart, state, value);
+        dy = edje_edit_state_aspect_max_get(ed, ppart, state, value);
         if (machine) printf("ASPECT-MIN: %g\nASPECT-MAX: %g\n", dx, dy);
         else if (FDIFF(dx, 0.0) || FDIFF(dy, 0.0))
           printf(INDENT4 "aspect: %g %g;\n", dx, dy);
 
-        x = edje_edit_state_aspect_pref_get(ed, part, state, value);
+        x = edje_edit_state_aspect_pref_get(ed, ppart, state, value);
         str = aspect_pref_name_get(x);
         if (machine) printf("ASPECT-PREFERENCE: %s\n", str);
         else if (x) printf(INDENT4 "aspect_preference: %s;\n", str);
         /* do not free this str! */
 
-        str = edje_edit_state_color_class_get(ed, part, state, value);
+        str = edje_edit_state_color_class_get(ed, ppart, state, value);
         if (machine) printf("COLOR_CLASS: %s\n", str ? str : "");
         else if (str) printf(INDENT4 "color_class: \"%s\";\n", str);
         edje_edit_string_free(str);
      }
 
-   dx = edje_edit_state_rel1_relative_x_get(ed, part, state, value);
-   dy = edje_edit_state_rel1_relative_y_get(ed, part, state, value);
-   x = edje_edit_state_rel1_offset_x_get(ed, part, state, value);
-   y = edje_edit_state_rel1_offset_y_get(ed, part, state, value);
-   str = edje_edit_state_rel1_to_x_get(ed, part, state, value);
-   str2 = edje_edit_state_rel1_to_y_get(ed, part, state, value);
+   dx = edje_edit_state_rel1_relative_x_get(ed, ppart, state, value);
+   dy = edje_edit_state_rel1_relative_y_get(ed, ppart, state, value);
+   x = edje_edit_state_rel1_offset_x_get(ed, ppart, state, value);
+   y = edje_edit_state_rel1_offset_y_get(ed, ppart, state, value);
+   str = edje_edit_state_rel1_to_x_get(ed, ppart, state, value);
+   str2 = edje_edit_state_rel1_to_y_get(ed, ppart, state, value);
    if (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y) || (str) || (str2))
      {
         if (machine) puts("REL1-BEGIN");
@@ -372,12 +372,12 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
    edje_edit_string_free(str);
    edje_edit_string_free(str2);
 
-   dx = edje_edit_state_rel2_relative_x_get(ed, part, state, value);
-   dy = edje_edit_state_rel2_relative_y_get(ed, part, state, value);
-   x = edje_edit_state_rel2_offset_x_get(ed, part, state, value);
-   y = edje_edit_state_rel2_offset_y_get(ed, part, state, value);
-   str = edje_edit_state_rel2_to_x_get(ed, part, state, value);
-   str2 = edje_edit_state_rel2_to_y_get(ed, part, state, value);
+   dx = edje_edit_state_rel2_relative_x_get(ed, ppart, state, value);
+   dy = edje_edit_state_rel2_relative_y_get(ed, ppart, state, value);
+   x = edje_edit_state_rel2_offset_x_get(ed, ppart, state, value);
+   y = edje_edit_state_rel2_offset_y_get(ed, ppart, state, value);
+   str = edje_edit_state_rel2_to_x_get(ed, ppart, state, value);
+   str2 = edje_edit_state_rel2_to_y_get(ed, ppart, state, value);
    if (FDIFF(dx, 1.0) || FDIFF(dy, 1.0) || (x != -1) || (y != -1) ||
        (str) || (str2))
      {
@@ -410,7 +410,7 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
 
    if (t == EDJE_PART_TYPE_IMAGE)
      {
-        str = edje_edit_state_image_get(ed, part, state, value);
+        str = edje_edit_state_image_get(ed, ppart, state, value);
 
         if (machine) printf("IMAGE-BEGIN\nNORMAL: %s\n", str ? str : "");
         else if (detail > 1)
@@ -429,7 +429,7 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
              double dx2, dy2;
              Eina_Bool has_orgin, has_size;
 
-             tweens = edje_edit_state_tweens_list_get(ed, part, state, value);
+             tweens = edje_edit_state_tweens_list_get(ed, ppart, state, value);
              EINA_LIST_FOREACH(tweens, l, str)
                {
                   if (machine) printf("TWEEN: %s\n", str);
@@ -438,14 +438,14 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
              edje_edit_string_list_free(tweens);
 
              edje_edit_state_image_border_get
-               (ed, part, state, value, &bl, &br, &bt, &bb);
+               (ed, ppart, state, value, &bl, &br, &bt, &bb);
              if (machine)
                printf("BORDER-LEFT: %d\nBORDER-RIGHT: %d\n"
                       "BORDER-TOP: %d\nBORDER-BOTTOM: %d\n", bl, br, bt, bb);
              else if ((bl) || (br) || (bt) || (bb))
                printf(INDENT5 "border: %d %d %d %d;\n", bl, br, bt, bb);
 
-             x = edje_edit_state_image_border_fill_get(ed, part, state, value);
+             x = edje_edit_state_image_border_fill_get(ed, ppart, state, value);
              str = border_fill_name_get(x);
              if (machine) printf("BORDER-FILL: %s\n", str);
              else if (x != 1) printf(INDENT5 "middle: %s;\n", str);
@@ -454,22 +454,22 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
              // TODO support image.fill.smooth
 
              dx = edje_edit_state_fill_origin_relative_x_get
-               (ed, part, state, value);
+               (ed, ppart, state, value);
              dy = edje_edit_state_fill_origin_relative_y_get
-               (ed, part, state, value);
+               (ed, ppart, state, value);
              x = edje_edit_state_fill_origin_offset_x_get
-               (ed, part, state, value);
+               (ed, ppart, state, value);
              y = edje_edit_state_fill_origin_offset_y_get
-               (ed, part, state, value);
+               (ed, ppart, state, value);
 
              dx2 = edje_edit_state_fill_size_relative_x_get
-               (ed, part, state, value);
+               (ed, ppart, state, value);
              dy2 = edje_edit_state_fill_size_relative_y_get
-               (ed, part, state, value);
+               (ed, ppart, state, value);
              x2 = edje_edit_state_fill_size_offset_x_get
-               (ed, part, state, value);
+               (ed, ppart, state, value);
              y2 = edje_edit_state_fill_size_offset_y_get
-               (ed, part, state, value);
+               (ed, ppart, state, value);
 
              has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y));
              has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2));
@@ -531,22 +531,22 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
        // TODO support proxy.fill.smooth
 
        dx = edje_edit_state_fill_origin_relative_x_get
-         (ed, part, state, value);
+         (ed, ppart, state, value);
        dy = edje_edit_state_fill_origin_relative_y_get
-         (ed, part, state, value);
+         (ed, ppart, state, value);
        x = edje_edit_state_fill_origin_offset_x_get
-         (ed, part, state, value);
+         (ed, ppart, state, value);
        y = edje_edit_state_fill_origin_offset_y_get
-         (ed, part, state, value);
+         (ed, ppart, state, value);
 
        dx2 = edje_edit_state_fill_size_relative_x_get
-         (ed, part, state, value);
+         (ed, ppart, state, value);
        dy2 = edje_edit_state_fill_size_relative_y_get
-         (ed, part, state, value);
+         (ed, ppart, state, value);
        x2 = edje_edit_state_fill_size_offset_x_get
-         (ed, part, state, value);
+         (ed, ppart, state, value);
        y2 = edje_edit_state_fill_size_offset_y_get
-         (ed, part, state, value);
+         (ed, ppart, state, value);
 
        has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y));
        has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2));
@@ -600,34 +600,34 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
         if (machine) puts("TEXT-BEGIN");
         else puts(INDENT4 "text {");
 
-        str = edje_edit_state_text_get(ed, part, state, value);
+        str = edje_edit_state_text_get(ed, ppart, state, value);
         if (machine) printf("TEXT: %s\n", str ? str : "");
         else if (str) printf(INDENT5 "text: \"%s\";\n", str);
         edje_edit_string_free(str);
 
-        str = edje_edit_state_font_get(ed, part, state, value);
+        str = edje_edit_state_font_get(ed, ppart, state, value);
         if (machine) printf("FONT: %s\n", str ? str : "");
         else if (str) printf(INDENT5 "font: \"%s\";\n", str);
         edje_edit_string_free(str);
 
-        x = edje_edit_state_text_size_get(ed, part, state, value);
+        x = edje_edit_state_text_size_get(ed, ppart, state, value);
         if (machine) printf("SIZE: %d\n", x);
         else if (x > 0) printf(INDENT5 "size: %d;\n", x);
 
         // TODO text_class
 
-        dx = edje_edit_state_text_align_x_get(ed, part, state, value);
-        dy = edje_edit_state_text_align_y_get(ed, part, state, value);
+        dx = edje_edit_state_text_align_x_get(ed, ppart, state, value);
+        dy = edje_edit_state_text_align_y_get(ed, ppart, state, value);
         if (machine) printf("TEXT-ALIGN-X: %g\nTEXT-ALIGN-Y: %g\n", dx, dy);
         else if (FDIFF(dx, 0.5) || FDIFF(dy, 0.5))
           printf(INDENT5 "align: %g %g;\n", dx, dy);
 
-        x = edje_edit_state_text_fit_x_get(ed, part, state, value);
-        y = edje_edit_state_text_fit_y_get(ed, part, state, value);
+        x = edje_edit_state_text_fit_x_get(ed, ppart, state, value);
+        y = edje_edit_state_text_fit_y_get(ed, ppart, state, value);
         if (machine) printf("TEXT-FIT-X: %d\nTEXT-FIT-Y: %d\n", x, y);
         else if ((x) || (y)) printf(INDENT5 "fit: %d %d;\n", x, y);
 
-        dx = edje_edit_state_text_elipsis_get(ed, part, state, value);
+        dx = edje_edit_state_text_elipsis_get(ed, ppart, state, value);
         if (machine) printf("TEXT-ELIPSIS: %g\n", dx);
         else if (FDIFF(dx, 0.5)) printf(INDENT5 "elipsis: %g;\n", dx);
 
@@ -640,7 +640,7 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
         const Edje_External_Param *p;
 
         params = edje_edit_state_external_params_list_get
-          (ed, part, state, value);
+          (ed, ppart, state, value);
 
         if (params)
           {
@@ -766,16 +766,16 @@ _api_name_fix(const char *orig)
 }
 
 static char *
-_part_api_name_get(Evas_Object *ed, const char *part)
+_part_api_name_get(Evas_Object *ed, const char *ppart)
 {
-   const char *orig = edje_edit_part_api_name_get(ed, part);
+   const char *orig = edje_edit_part_api_name_get(ed, ppart);
    char *fix = _api_name_fix(orig);
    edje_edit_string_free(orig);
    return fix;
 }
 
 static void
-part_details(Evas_Object *ed, const char *part)
+part_details(Evas_Object *ed, const char *ppart)
 {
    Eina_List *states, *l;
    Eina_Bool b;
@@ -786,8 +786,8 @@ part_details(Evas_Object *ed, const char *part)
 
    if (machine) puts("PART-DETAILS-BEGIN");
 
-   str = api =_part_api_name_get(ed, part);
-   str2 = edje_edit_part_api_description_get(ed, part);
+   str = api =_part_api_name_get(ed, ppart);
+   str2 = edje_edit_part_api_description_get(ed, ppart);
    if (machine)
      {
         printf("API-NAME: %s\n", str ? str : "");
@@ -798,67 +798,67 @@ part_details(Evas_Object *ed, const char *part)
    free(api);
    edje_edit_string_free(str2);
 
-   b = edje_edit_part_mouse_events_get(ed, part);
+   b = edje_edit_part_mouse_events_get(ed, ppart);
    if (machine) printf("MOUSE_EVENTS: %d\n", b);
    else if (!b) puts(INDENT3 "mouse_events: 0;");
 
    if (detail > 1)
      {
-        b = edje_edit_part_repeat_events_get(ed, part);
+        b = edje_edit_part_repeat_events_get(ed, ppart);
         if (machine) printf("REPEAT_EVENTS: %d\n", b);
         else if (b) puts(INDENT3 "repeat_events: 1;");
 
-        b = edje_edit_part_scale_get(ed, part);
+        b = edje_edit_part_scale_get(ed, ppart);
         if (machine) printf("SCALE: %d\n", b);
         else if (b) puts(INDENT3 "scale: 1;");
      }
 
-   str = edje_edit_part_clip_to_get(ed, part);
+   str = edje_edit_part_clip_to_get(ed, ppart);
    if (machine) printf("CLIP_TO: %s\n", str ? str : "");
    else if (str) printf(INDENT3 "clip_to: \"%s\";\n", str);
    edje_edit_string_free(str);
 
-   str = edje_edit_part_source_get(ed, part);
+   str = edje_edit_part_source_get(ed, ppart);
    if (machine) printf("SOURCE: %s\n", str ? str : "");
    else if (str) printf(INDENT3 "source: \"%s\";\n", str);
    edje_edit_string_free(str);
 
    if (detail > 1)
      {
-        if (edje_edit_part_type_get(ed, part) == EDJE_PART_TYPE_TEXT)
+        if (edje_edit_part_type_get(ed, ppart) == EDJE_PART_TYPE_TEXT)
           {
-             str = text_effect_name_get(edje_edit_part_effect_get(ed, part));
+             str = text_effect_name_get(edje_edit_part_effect_get(ed, ppart));
              if (machine) printf("EFFECT: %s\n", str ? str : "");
              else if (str) printf(INDENT3 "effect: %s;\n", str);
              /* do not free this str! */
           }
 
-        if (edje_edit_part_drag_x_get(ed, part) ||
-            edje_edit_part_drag_y_get(ed, part))
+        if (edje_edit_part_drag_x_get(ed, ppart) ||
+            edje_edit_part_drag_y_get(ed, ppart))
           {
              int dir, step, count;
 
              if (machine) puts("DRAGABLE-BEGIN");
              else puts(INDENT3 "dragable {");
 
-             dir = edje_edit_part_drag_x_get(ed, part);
-             step = edje_edit_part_drag_step_x_get(ed, part);
-             count = edje_edit_part_drag_count_x_get(ed, part);
+             dir = edje_edit_part_drag_x_get(ed, ppart);
+             step = edje_edit_part_drag_step_x_get(ed, ppart);
+             count = edje_edit_part_drag_count_x_get(ed, ppart);
              if (machine) printf("DRAG-X: %d %d %d\n", dir, step, count);
              else printf(INDENT4 "x: %d %d %d;\n", dir, step, count);
 
-             dir = edje_edit_part_drag_y_get(ed, part);
-             step = edje_edit_part_drag_step_y_get(ed, part);
-             count = edje_edit_part_drag_count_y_get(ed, part);
+             dir = edje_edit_part_drag_y_get(ed, ppart);
+             step = edje_edit_part_drag_step_y_get(ed, ppart);
+             count = edje_edit_part_drag_count_y_get(ed, ppart);
              if (machine) printf("DRAG-Y: %d %d %d\n", dir, step, count);
              else printf(INDENT4 "y: %d %d %d;\n", dir, step, count);
 
-             str = edje_edit_part_drag_confine_get(ed, part);
+             str = edje_edit_part_drag_confine_get(ed, ppart);
              if (machine) printf("DRAG-CONFINE: %s\n", str ? str : "");
              else if (str) printf(INDENT4 "confine: \"%s\";\n", str);
              edje_edit_string_free(str);
 
-             str = edje_edit_part_drag_event_get(ed, part);
+             str = edje_edit_part_drag_event_get(ed, ppart);
              if (machine) printf("DRAG-EVENTS: %s\n", str ? str : "");
              else if (str) printf(INDENT4 "events: \"%s\";\n", str);
              edje_edit_string_free(str);
@@ -868,7 +868,7 @@ part_details(Evas_Object *ed, const char *part)
           }
      }
 
-   states = edje_edit_part_states_list_get(ed, part);
+   states = edje_edit_part_states_list_get(ed, ppart);
    EINA_LIST_FOREACH(states, l, str)
      {
         char state[512], *delim;
@@ -879,7 +879,7 @@ part_details(Evas_Object *ed, const char *part)
         delim++;
         value = strtod(delim, NULL);
         state_begin(state, value);
-        state_details(ed, part, state, value);
+        state_details(ed, ppart, state, value);
         state_end();
      }
    edje_edit_string_list_free(states);
@@ -1047,9 +1047,9 @@ program_end(void)
 
 
 static char *
-_program_api_name_get(Evas_Object *ed, const char *program)
+_program_api_name_get(Evas_Object *ed, const char *pprogram)
 {
-   const char *orig = edje_edit_program_api_name_get(ed, program);
+   const char *orig = edje_edit_program_api_name_get(ed, pprogram);
    char *fix = _api_name_fix(orig);
    edje_edit_string_free(orig);
    return fix;
@@ -1071,7 +1071,7 @@ _transition_name_get(Edje_Tween_Mode mode)
 }
 
 static void
-program_details(Evas_Object *ed, const char *program)
+program_details(Evas_Object *ed, const char *pprogram)
 {
    const char *str, *str2;
    char *api;
@@ -1080,8 +1080,8 @@ program_details(Evas_Object *ed, const char *program)
 
    if (machine) puts("PROGRAM-DETAILS-BEGIN");
 
-   str = api =_program_api_name_get(ed, program);
-   str2 = edje_edit_program_api_description_get(ed, program);
+   str = api =_program_api_name_get(ed, pprogram);
+   str2 = edje_edit_program_api_description_get(ed, pprogram);
    if (machine)
      {
         printf("API-NAME: %s\n", str ? str : "");
@@ -1092,12 +1092,12 @@ program_details(Evas_Object *ed, const char *program)
    free(api);
    edje_edit_string_free(str2);
 
-   str = edje_edit_program_signal_get(ed, program);
+   str = edje_edit_program_signal_get(ed, pprogram);
    if (machine) printf("SIGNAL: %s\n", str ? str : "");
    else if (str) printf(INDENT3 "signal: \"%s\";\n", str);
    edje_edit_string_free(str);
 
-   str = edje_edit_program_source_get(ed, program);
+   str = edje_edit_program_source_get(ed, pprogram);
    if (machine) printf("SOURCE: %s\n", str ? str : "");
    else if (str) printf(INDENT3 "source: \"%s\";\n", str);
    edje_edit_string_free(str);
@@ -1105,7 +1105,7 @@ program_details(Evas_Object *ed, const char *program)
    if (detail >= 1)
      {
         Eina_List *lst, *l;
-        Edje_Action_Type type = edje_edit_program_action_get(ed, program);
+        Edje_Action_Type type = edje_edit_program_action_get(ed, pprogram);
         switch (type)
           {
            case EDJE_ACTION_TYPE_ACTION_STOP:
@@ -1113,18 +1113,18 @@ program_details(Evas_Object *ed, const char *program)
               else puts(INDENT3 "action: ACTION_STOP;");
               break;
            case EDJE_ACTION_TYPE_STATE_SET:
-              str = edje_edit_program_state_get(ed, program);
+              str = edje_edit_program_state_get(ed, pprogram);
               if (machine)
                 printf("ACTION: STATE_SET\nACTION-STATE: %s %g\n",
-                       str, edje_edit_program_value_get(ed, program));
+                       str, edje_edit_program_value_get(ed, pprogram));
               else
                 printf(INDENT3 "action: STATE_SET \"%s\" %2.1f;\n",
-                       str, edje_edit_program_value_get(ed, program));
+                       str, edje_edit_program_value_get(ed, pprogram));
               edje_edit_string_free(str);
               break;
            case EDJE_ACTION_TYPE_SIGNAL_EMIT:
-              str = edje_edit_program_state_get(ed, program);
-              str2 = edje_edit_program_state2_get(ed, program);
+              str = edje_edit_program_state_get(ed, pprogram);
+              str2 = edje_edit_program_state2_get(ed, pprogram);
               if (machine)
                 printf("ACTION: SIGNAL_EMIT\nACTION-SIGNAL: %s\n"
                        "ACTION-SOURCE: %s\n",
@@ -1146,7 +1146,7 @@ program_details(Evas_Object *ed, const char *program)
               //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_PAGE TODO;\n");
               //~ break;
            default:
-              ERR("Unhandled program action type %d", type);
+              ERR("Unhandled pprogram action type %d", type);
               break;
           }
 
@@ -1154,11 +1154,11 @@ program_details(Evas_Object *ed, const char *program)
           {
              double from, range;
 
-             from = edje_edit_program_transition_time_get(ed, program);
+             from = edje_edit_program_transition_time_get(ed, pprogram);
              if (from > 0.0)
                {
                   str = _transition_name_get
-                    (edje_edit_program_transition_get(ed, program));
+                    (edje_edit_program_transition_get(ed, pprogram));
                   if (machine)
                     printf("TRANSITION-NAME: %s\nTRANSITION-DURATION: %g\n",
                            str, from);
@@ -1166,8 +1166,8 @@ program_details(Evas_Object *ed, const char *program)
                   /* do not free str! */
                }
 
-             from = edje_edit_program_in_from_get(ed, program);
-             range = edje_edit_program_in_range_get(ed, program);
+             from = edje_edit_program_in_from_get(ed, pprogram);
+             range = edje_edit_program_in_range_get(ed, pprogram);
              if (FDIFF(from, 0.0) || FDIFF(range, 0.0))
                {
                   if (machine)
@@ -1176,13 +1176,13 @@ program_details(Evas_Object *ed, const char *program)
                }
           }
 
-        lst = edje_edit_program_targets_get(ed, program);
+        lst = edje_edit_program_targets_get(ed, pprogram);
         EINA_LIST_FOREACH(lst, l, str)
           if (machine) printf("TARGET: %s\n", str);
           else printf(INDENT3 "target: \"%s\";\n", str);
         edje_edit_string_list_free(lst);
 
-        lst = edje_edit_program_afters_get(ed, program);
+        lst = edje_edit_program_afters_get(ed, pprogram);
         EINA_LIST_FOREACH(lst, l, str)
           if (machine) printf("AFTER: %s\n", str);
           else printf(INDENT3 "after: \"%s\";\n", str);
diff --git a/libraries/edje/src/bin/edje_multisense_convert.c b/libraries/edje/src/bin/edje_multisense_convert.c
index d37d218..62c2f67 100644
--- a/libraries/edje/src/bin/edje_multisense_convert.c
+++ b/libraries/edje/src/bin/edje_multisense_convert.c
@@ -12,7 +12,7 @@
 # endif
 
 Edje_Sound_Encode *
-_edje_multisense_encode(const char *filename, Edje_Sound_Sample *sample, double quality)
+_edje_multisense_encode(const char *filename, Edje_Sound_Sample *sample, double quality __UNUSED__)
 {
    SF_INFO sfinfo;
    SNDFILE* sfile;
diff --git a/libraries/edje/src/bin/epp/Makefile.in b/libraries/edje/src/bin/epp/Makefile.in
index 2ef2e56..c1a8ee5 100644
--- a/libraries/edje/src/bin/epp/Makefile.in
+++ b/libraries/edje/src/bin/epp/Makefile.in
@@ -225,8 +225,6 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/bin/epp/cppmain.c b/libraries/edje/src/bin/epp/cppmain.c
index 45b67b5..ea0a0b2 100644
--- a/libraries/edje/src/bin/epp/cppmain.c
+++ b/libraries/edje/src/bin/epp/cppmain.c
@@ -44,7 +44,9 @@ main(int argc, char **argv)
    int                 argi = 1;        /* Next argument to handle. */
    struct cpp_options *opts = &options;
    enum cpp_token      kind;
-   int                 got_text;
+#if EPP_DEBUG
+   int                 got_text = 0;
+#endif
 
    p = argv[0] + strlen(argv[0]);
 #ifndef __EMX__
@@ -76,7 +78,6 @@ main(int argc, char **argv)
    else if (!freopen(opts->out_fname, "w", stdout))
       cpp_pfatal_with_name(&parse_in, opts->out_fname);
 
-   got_text = 0;
    for (i = 0;; i++)
      {
         kind = cpp_get_token(&parse_in);
@@ -108,7 +109,9 @@ main(int argc, char **argv)
           case CPP_COMMA:
           case CPP_SEMICOLON:
           case CPP_3DOTS:
-             got_text = 1;
+#if EPP_DEBUG
+             got_text = 1;
+#endif
              continue;
 
           case CPP_COMMENT:
@@ -130,7 +133,9 @@ main(int argc, char **argv)
                 exit(FATAL_EXIT_CODE);
           }
         parse_in.limit = parse_in.token_buffer;
-        got_text = 0;
+#if EPP_DEBUG
+        got_text = 0;
+#endif
      }
 
  done: