Enlightenment

Log:
  	* elixir: complete removal of gradient object.
  
Author:       cedric
Date:         2010-07-02 02:03:13 -0700 (Fri, 02 Jul 2010)
New Revision: 49993

Modified:
  trunk/BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_module.c trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-bindings.c trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-bindings.h 

Modified: trunk/BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_module.c
===================================================================
--- trunk/BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_module.c	2010-07-02 08:56:09 UTC (rev 49992)
+++ trunk/BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_module.c	2010-07-02 09:03:13 UTC (rev 49993)
@@ -234,7 +234,6 @@
   { "text", "evas_object_text" },
   { "line", "evas_object_line" },
   { "image", "evas_object_image" },
-  { "gradient", "evas_object_gradient" },
   { "edje", "edje_object" },
   { NULL, NULL }
 };

Modified: trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-bindings.c
===================================================================
--- trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-bindings.c	2010-07-02 08:56:09 UTC (rev 49992)
+++ trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-bindings.c	2010-07-02 09:03:13 UTC (rev 49993)
@@ -25,9 +25,6 @@
 elixir_parameter_t                      evas_object_line_parameter = {
   "Evas_Object_Line", JOBJECT, NULL
 };
-elixir_parameter_t                      evas_object_gradient_parameter = {
-  "Evas_Object_Gradient", JOBJECT, NULL
-};
 elixir_parameter_t                      evas_object_polygon_parameter = {
   "Evas_Object_Polygon", JOBJECT, NULL
 };
@@ -318,7 +315,6 @@
   { "text", "evas_object_text" },
   { "line", "evas_object_line" },
   { "image", "evas_object_image" },
-  { "gradient", "evas_object_gradient" },
   { "edje", "edje_object" },
   { NULL, NULL }
 };
@@ -523,7 +519,6 @@
    evas_object_parameter.class = elixir_class_request("evas_object", NULL);
    evas_object_rectangle_parameter.class = elixir_class_request("evas_object_rectangle", "evas_object");
    evas_object_line_parameter.class = elixir_class_request("evas_object_line", "evas_object");
-   evas_object_gradient_parameter.class = elixir_class_request("evas_object_gradient", "evas_object");
    evas_object_polygon_parameter.class = elixir_class_request("evas_object_polygon", "evas_object");
    evas_object_image_parameter.class = elixir_class_request("evas_object_image", "evas_object");
    evas_object_smart_parameter.class = elixir_class_request("evas_object_smart", "evas_object");

Modified: trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-bindings.h
===================================================================
--- trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-bindings.h	2010-07-02 08:56:09 UTC (rev 49992)
+++ trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-bindings.h	2010-07-02 09:03:13 UTC (rev 49993)
@@ -7,7 +7,6 @@
 extern elixir_parameter_t       evas_object_parameter;
 extern elixir_parameter_t       evas_object_rectangle_parameter;
 extern elixir_parameter_t       evas_object_line_parameter;
-extern elixir_parameter_t       evas_object_gradient_parameter;
 extern elixir_parameter_t       evas_object_polygon_parameter;
 extern elixir_parameter_t       evas_object_image_parameter;
 extern elixir_parameter_t       evas_object_smart_parameter;

Log:
  	* elixir: fix with upstream update.
  
Author:       cedric
Date:         2010-10-04 03:45:42 -0700 (Mon, 04 Oct 2010)
New Revision: 53020

Modified:
  trunk/BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_module.c trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-params.c trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/void-params.c 

Modified: trunk/BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_module.c
===================================================================
--- trunk/BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_module.c	2010-10-04 10:25:50 UTC (rev 53019)
+++ trunk/BINDINGS/javascript/elixir/src/modules/bindings/edje/edje_module.c	2010-10-04 10:45:42 UTC (rev 53020)
@@ -2037,7 +2037,7 @@
 }
 
 static void
-_elixir_edje_object_text_insert_filter_cb(void *data, Evas_Object *obj, const char *part, char **text)
+_elixir_edje_object_text_insert_filter_cb(void *data, Evas_Object *obj, const char *part, Edje_Text_Filter_Type type, char **text)
 {
    JSFunction *cb;
    JSContext *cx;
@@ -2045,7 +2045,7 @@
    JSString *spart;
    JSString *stext;
    jsval js_return;
-   jsval argv[4];
+   jsval argv[5];
 
    cb = elixir_void_get_private(data);
    cx = elixir_void_get_cx(data);
@@ -2069,9 +2069,10 @@
 
    argv[0] = elixir_void_get_jsval(data);
    argv[2] = STRING_TO_JSVAL(spart);
-   argv[3] = STRING_TO_JSVAL(stext);
+   argv[3] = INT_TO_JSVAL(type);
+   argv[4] = STRING_TO_JSVAL(stext);
 
-   if (!elixir_function_run(cx, cb, parent, 4, argv, &js_return))
+   if (!elixir_function_run(cx, cb, parent, 5, argv, &js_return))
      goto on_run_error;
 
    *text = elixir_get_string(cx, js_return);
@@ -2134,7 +2135,7 @@
    lst = evas_object_data_get(eo, "elixir_jsmap");
    data = elixir_jsmap_find(&lst, val[3].v.any, -5);
 
-   edje_object_text_insert_filter_callback_del(eo, part, _elixir_edje_object_text_insert_filter_cb, data);
+   edje_object_text_insert_filter_callback_del(eo, part, _elixir_edje_object_text_insert_filter_cb);
 
    lst = elixir_jsmap_del(lst, cx, val[3].v.any, -5);
    evas_object_data_set(eo, "elixir_jsmap", lst);

Modified: trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-params.c
===================================================================
--- trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-params.c	2010-10-04 10:25:50 UTC (rev 53019)
+++ trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/evas-object-params.c	2010-10-04 10:45:42 UTC (rev 53020)
@@ -214,6 +214,12 @@
    return (int) evas_object_image_border_center_fill_get(obj);
 }
 
+static int
+_elixir_evas_object_image_load_error_get(const Evas_Object *obj)
+{
+   return (int) evas_object_image_load_error_get(obj);
+}
+
 static JSBool
 elixir_int_evas_object_params(int (*func)(const Evas_Object *obj),
                               const elixir_parameter_t *params[],
@@ -580,7 +586,7 @@
 FAST_CALL_PARAMS_SPEC_CAST(evas_object_image_border_center_fill_get, elixir_int_evas_object_params, _evas_object_image_params);
 
 FAST_CALL_PARAMS_SPEC_CAST(evas_object_layer_get, elixir_int_evas_object_params, _evas_object_params);
-FAST_CALL_PARAMS_SPEC(evas_object_image_load_error_get, elixir_int_evas_object_params, _evas_object_image_params);
+FAST_CALL_PARAMS_SPEC_CAST(evas_object_image_load_error_get, elixir_int_evas_object_params, _evas_object_image_params);
 FAST_CALL_PARAMS_SPEC(evas_object_image_load_scale_down_get, elixir_int_evas_object_params, _evas_object_image_params);
 FAST_CALL_PARAMS_SPEC(evas_object_text_ascent_get, elixir_int_evas_object_params, _evas_object_text_params);
 FAST_CALL_PARAMS_SPEC(evas_object_text_descent_get, elixir_int_evas_object_params, _evas_object_text_params);

Modified: trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/void-params.c
===================================================================
--- trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/void-params.c	2010-10-04 10:25:50 UTC (rev 53019)
+++ trunk/BINDINGS/javascript/elixir/src/modules/bindings/evas/void-params.c	2010-10-04 10:45:42 UTC (rev 53020)
@@ -47,6 +47,12 @@
    return JS_TRUE;
 }
 
+static int
+_elixir_evas_alloc_error(void)
+{
+   return (int) evas_alloc_error();
+}
+
 static JSBool
 elixir_evas_textblock_style_new(JSContext *cx, uintN argc, jsval *vp)
 {
@@ -63,7 +69,7 @@
    return JS_TRUE;
 }
 
-FAST_CALL_PARAMS(evas_alloc_error, elixir_int_params_void);
+FAST_CALL_PARAMS_CAST(evas_alloc_error, elixir_int_params_void);
 FAST_CALL_PARAMS(evas_init, elixir_int_params_void);
 FAST_CALL_PARAMS(evas_shutdown, elixir_int_params_void);