[EGIT] [core/elementary] master 01/01: elm_glview.c: Set ret value false by default on smart_on_focus.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=895d98fb1dbb0f1cc8f868239ac5327e9b62b353
commit 895d98fb1dbb0f1cc8f868239ac5327e9b62b353
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Fri Oct 4 22:20:43 2013 +0900
elm_glview.c: Set ret value false by default on smart_on_focus.
---
src/lib/elm_glview.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index 91386f4..fe0da8a 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -38,6 +38,7 @@ static void
_elm_glview_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+ if (ret) *ret = EINA_FALSE;
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
Eina_Bool int_ret = EINA_FALSE;
--
[EGIT] [core/elementary] master 03/59: elc_ctxpopup.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=52f31bbc02236b15906cc24f1e515cdb082f1c9f
commit 52f31bbc02236b15906cc24f1e515cdb082f1c9f
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:11:57 2013 +0900
elc_ctxpopup.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elc_ctxpopup.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 3b1af6b..e4a675b 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -231,7 +231,7 @@ _base_geometry_calc(Evas_Object *obj,
int idx;
ELM_CTXPOPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_CTXPOPUP_DIRECTION_DOWN);
if (!rect || !sd-parent) return ELM_CTXPOPUP_DIRECTION_DOWN;
@@ -406,7 +406,7 @@ _arrow_update(Evas_Object *obj,
double drag;
ELM_CTXPOPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
evas_object_geometry_get(obj, x, y, NULL, NULL);
evas_object_geometry_get
@@ -645,7 +645,7 @@ _elm_ctxpopup_smart_sizing_eval(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
Evas_Coord_Point list_size = { 0, 0 };
Elm_Ctxpopup_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (!sd-arrow) return; /* simple way to flag under deletion */
if (!sd-parent) return; /* do not calculate sizes unless parent is set */
@@ -1219,7 +1219,7 @@ elm_ctxpopup_add(Evas_Object *parent)
/* access: parent could be any object such as elm_list which does
not know elc_ctxpopup as its child object in the focus_next(); */
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
wd-highlight_root = EINA_TRUE;
return obj;
--
[EGIT] [core/elementary] master 07/59: elc_hoversel.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=02938fa9662af16f3cf4c728d84d9d6349da45db commit 02938fa9662af16f3cf4c728d84d9d6349da45db Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Oct 5 17:12:44 2013 +0900 elc_hoversel.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro. --- src/lib/elc_hoversel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c index 2d0f068..9f47c6e 100644 --- a/src/lib/elc_hoversel.c +++ b/src/lib/elc_hoversel.c @@ -43,7 +43,7 @@ _elm_hoversel_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) Eina_Bool int_ret; Elm_Hoversel_Smart_Data *sd = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); char buf[4096]; const char *style; --
[EGIT] [core/elementary] master 01/59: elm_widget.h: support return values for ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d9e81284369edad30f9225d86f1959c6901e87d8
commit d9e81284369edad30f9225d86f1959c6901e87d8
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 16:25:40 2013 +0900
elm_widget.h: support return values for ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_widget.h | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index b67feef..64dc763 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -793,16 +793,16 @@ EAPI Eina_List
*elm_widget_scrollable_children_get(Evas_Object *obj);
EAPI void elm_widget_tree_dump(const Evas_Object *top);
EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE
*output);
-#define ELM_WIDGET_DATA_GET_OR_RETURN(o, ptr)\
+#define ELM_WIDGET_DATA_GET_OR_RETURN(o, ptr, ...) \
Elm_Widget_Smart_Data *ptr; \
- ptr = (o ?\
-eo_data_scope_get(o, ELM_OBJ_WIDGET_CLASS) :\
+ ptr = (o ?\
+eo_data_scope_get(o, ELM_OBJ_WIDGET_CLASS) :\
NULL); \
if (!ptr) \
{\
CRITICAL(no widget data for object %p (%s), \
o, evas_object_type_get(o));\
- return; \
+ return __VA_ARGS__; \
}
#define ELM_WIDGET_CHECK(obj) \
--
[EGIT] [core/elementary] master 05/59: elc_fileselector_button.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=3339bbf3f5447c392db687a3762ac713a9197332 commit 3339bbf3f5447c392db687a3762ac713a9197332 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Oct 5 17:12:19 2013 +0900 elc_fileselector_button.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro. --- src/lib/elc_fileselector_button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c index 4baef77..df5b550 100644 --- a/src/lib/elc_fileselector_button.c +++ b/src/lib/elc_fileselector_button.c @@ -45,7 +45,7 @@ _elm_fileselector_button_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *li char buf[4096]; const char *style; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); style = eina_stringshare_add(elm_widget_style_get(obj)); --
[EGIT] [core/elementary] master 04/59: elc_fileselector.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=32fe06cca9ebe18c27863eb5bd3ea69505a105b7
commit 32fe06cca9ebe18c27863eb5bd3ea69505a105b7
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:12:11 2013 +0900
elc_fileselector.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elc_fileselector.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index cb96372..d608c81 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -59,7 +59,7 @@ _elm_fileselector_smart_sizing_eval(Eo *obj, void *_pd
EINA_UNUSED, va_list *lis
{
Evas_Coord minw = -1, minh = -1;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_coords_finger_size_adjust(1, minw, 1, minh);
edje_object_size_min_restricted_calc
@@ -88,7 +88,7 @@ _elm_fileselector_smart_theme(Eo *obj, void *_pd, va_list
*list)
char buf[1024];
Elm_Fileselector_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret;
--
[EGIT] [core/elementary] master 02/59: elm_layout.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=dcdda04f064c08108e498073c61e93ce962ceab3
commit dcdda04f064c08108e498073c61e93ce962ceab3
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 16:36:33 2013 +0900
elm_layout.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_layout.c | 80 ++--
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index b28704c..31184e2 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -83,7 +83,7 @@ _on_sub_object_size_hint_change(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
if (wd-frozen) return;
eo_do(data, elm_obj_layout_sizing_eval());
}
@@ -102,7 +102,8 @@ static void
_sizing_eval(Evas_Object *obj, Elm_Layout_Smart_Data *sd)
{
Evas_Coord minh = -1, minw = -1;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj,
ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(sd-obj, wd);
+
edje_object_size_min_calc(wd-resize_obj, minw, minh);
evas_object_size_hint_min_set(obj, minw, minh);
evas_object_size_hint_max_set(obj, -1, -1);
@@ -131,7 +132,7 @@ _icon_signal_emit(Elm_Layout_Smart_Data *sd,
snprintf(buf, sizeof(buf), elm,state,%s,%s, type,
visible ? visible : hidden);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj,
ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(sd-obj, wd);
edje_object_signal_emit(wd-resize_obj, buf, elm);
/* themes might need immediate action here */
@@ -150,7 +151,7 @@ _text_signal_emit(Elm_Layout_Smart_Data *sd,
//Send signals for all text parts after elm 2.0
if (sub_d-type != TEXT || strcmp(elm.text, sub_d-part)) return;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj,
ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(sd-obj, wd);
if (strncmp(sub_d-part, elm.text., sizeof(elm.text.) - 1) == 0)
type = sub_d-part + sizeof(elm.text.) - 1;
@@ -206,7 +207,7 @@ _parts_text_fix(Elm_Layout_Smart_Data *sd)
{
const Eina_List *l;
Elm_Layout_Sub_Object_Data *sub_d;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj,
ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(sd-obj, wd);
EINA_LIST_FOREACH(sd-subs, l, sub_d)
{
@@ -233,7 +234,7 @@ _parts_cursors_apply(Elm_Layout_Smart_Data *sd)
const Eina_List *l;
const char *file, *group;
Elm_Layout_Sub_Object_Cursor *pc;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj,
ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(sd-obj, wd);
edje_object_file_get(wd-resize_obj, file, group);
@@ -281,7 +282,7 @@ _visuals_refresh(Evas_Object *obj,
Elm_Layout_Smart_Data *sd)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
_parts_swallow_fix(sd, wd);
_parts_text_fix(sd);
@@ -301,7 +302,7 @@ _visuals_refresh(Evas_Object *obj,
static void
_elm_layout_smart_disable(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
@@ -325,7 +326,7 @@ _elm_layout_smart_theme(Eo *obj, void *_pd, va_list *list)
const char *fh;
Elm_Layout_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, elm_wdg_theme(int_ret));
if (!int_ret) return;
@@ -376,7 +377,7 @@ _elm_layout_list_data_get(const Eina_List *list)
static void
_elm_layout_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
@@ -477,7 +478,7 @@ _elm_layout_smart_sub_object_del(Eo *obj, void *_pd,
va_list *list)
Eina_Bool int_ret = EINA_FALSE;
Elm_Layout_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
evas_object_event_callback_del_full
(sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
@@ -618,9 +619,8 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj
EINA_UNUSED,
if (!*part)
{
-Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj,
ELM_OBJ_WIDGET_CLASS);
ERR(no default content part set for object %p --
-part must not be NULL, wd-obj);
+part must not be NULL, sd-obj);
[EGIT] [core/elementary] master 09/59: elc_naviframe.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=fca85ce6eb30c9bbc46505f112e32707a29d0970
commit fca85ce6eb30c9bbc46505f112e32707a29d0970
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:12:56 2013 +0900
elc_naviframe.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elc_naviframe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 5dfd289..e6509f4 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1330,7 +1330,7 @@ static void
_elm_naviframe_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Naviframe_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
--
[EGIT] [core/elementary] master 08/59: elc_multibuttonentry.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d0fac565037df0b2f250527148723a665957903a
commit d0fac565037df0b2f250527148723a665957903a
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:12:50 2013 +0900
elc_multibuttonentry.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elc_multibuttonentry.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index f800fc6..fcb1ac7 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -830,7 +830,7 @@ _elm_multibuttonentry_smart_sizing_eval(Eo *obj, void *_pd,
va_list *list EINA_U
Evas_Coord left, right, top, bottom;
Elm_Multibuttonentry_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
evas_object_size_hint_min_get(sd-box, minw, minh);
edje_object_part_geometry_get
@@ -1031,7 +1031,7 @@ static void
_callbacks_register(Evas_Object *obj)
{
ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_layout_signal_callback_add
(obj, mouse,clicked,1, *, _mouse_clicked_signal_cb, sd);
@@ -1449,7 +1449,7 @@ static void
_elm_multibuttonentry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Multibuttonentry_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
--
[EGIT] [core/elementary] master 10/59: elc_player.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=7b716b7279504b8847dab9cd7e089c3b3ea54fb7
commit 7b716b7279504b8847dab9cd7e089c3b3ea54fb7
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:13:09 2013 +0900
elc_player.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elc_player.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index 9299a97..dafc32c 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -196,8 +196,7 @@ static void
_elm_player_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list
EINA_UNUSED)
{
Evas_Coord w, h;
-
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
edje_object_size_min_get(wd-resize_obj, w, h);
edje_object_size_min_restricted_calc
--
[EGIT] [core/elementary] master 06/59: elc_fileselector_entry.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ac93469e4d410b3e8599b103701e7a414aacb6af
commit ac93469e4d410b3e8599b103701e7a414aacb6af
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:12:27 2013 +0900
elc_fileselector_entry.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elc_fileselector_entry.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index eac61b7..5762b90 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -102,7 +102,7 @@ _elm_fileselector_entry_smart_sizing_eval(Eo *obj, void
*_pd EINA_UNUSED, va_lis
{
Evas_Coord minw = -1, minh = -1;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
edje_object_size_min_calc(wd-resize_obj, minw, minh);
evas_object_size_hint_min_set(obj, minw, minh);
@@ -188,7 +188,7 @@ _elm_fileselector_entry_smart_theme(Eo *obj, void *_pd,
va_list *list)
char buf[1024];
Elm_Fileselector_Entry_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_Bool int_ret;
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
--
[EGIT] [core/elementary] master 19/59: elm_check.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=3e717e097d449ebb52038eb607d39b3cecbbbea9
commit 3e717e097d449ebb52038eb607d39b3cecbbbea9
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:13:47 2013 +0900
elm_check.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_check.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 0887391..0098ac4 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -131,8 +131,7 @@ static void
_elm_check_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list
EINA_UNUSED)
{
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
-
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_coords_finger_size_adjust(1, minw, 1, minh);
edje_object_size_min_restricted_calc
@@ -178,7 +177,7 @@ _elm_check_smart_theme(Eo *obj, void *_pd EINA_UNUSED,
va_list *list)
Eina_Bool int_ret = EINA_FALSE;
Elm_Check_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, elm_wdg_theme(int_ret));
if (!int_ret) return;
@@ -289,7 +288,7 @@ _on_check_toggle(void *data,
static void
_elm_check_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@@ -365,7 +364,7 @@ _elm_check_smart_state_set(Eo *obj, void *_pd, va_list
*list)
{
Eina_Bool state = va_arg(*list, int);
Elm_Check_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (state != sd-state)
{
--
[EGIT] [core/elementary] master 23/59: elm_datetime.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=5eff10e0052ffbc6a90a7a23c4b6b0063fc60cbd
commit 5eff10e0052ffbc6a90a7a23c4b6b0063fc60cbd
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:14:00 2013 +0900
elm_datetime.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_datetime.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 96275b3..42bd40a 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -306,7 +306,7 @@ _reload_format(Evas_Object *obj)
char *dt_fmt;
ELM_DATETIME_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
// FIXME: provide nl_langinfo on Windows if possible
// fetch the default format from Libc.
@@ -497,7 +497,7 @@ _elm_datetime_smart_sizing_eval(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
unsigned int idx, field_count = 0;
Elm_Datetime_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
for (idx = 0; idx ELM_DATETIME_TYPE_COUNT; idx++)
{
@@ -524,7 +524,7 @@ _elm_datetime_smart_theme(Eo *obj, void *_pd, va_list *list)
unsigned int idx;
Elm_Datetime_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, elm_wdg_theme(int_ret));
if (!int_ret) return;
--
[EGIT] [core/elementary] master 17/59: elm_button.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c739f7cf770e44972b4cee5279446febcf9266e2
commit c739f7cf770e44972b4cee5279446febcf9266e2
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:13:39 2013 +0900
elm_button.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_button.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 824c9ad..758d253 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -64,7 +64,7 @@ _activate(Evas_Object *obj)
static void
_elm_button_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list
EINA_UNUSED)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Coord minw = -1, minh = -1;
elm_coords_finger_size_adjust(1, minw, 1, minh);
@@ -286,7 +286,7 @@ _access_state_cb(void *data __UNUSED__, Evas_Object *obj)
static void
_elm_button_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list
EINA_UNUSED)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
--
[EGIT] [core/elementary] master 11/59: elc_popup.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=31a8a0cc4771280f72ad4881b0e3449e515edd82
commit 31a8a0cc4771280f72ad4881b0e3449e515edd82
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:13:14 2013 +0900
elc_popup.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elc_popup.c | 32
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index cf03a2f..700a5d8 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -88,7 +88,7 @@ static Evas_Object *
_access_object_get(const Evas_Object *obj, const char* part)
{
Evas_Object *po, *ao;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
po = (Evas_Object *)edje_object_part_object_get(wd-resize_obj, part);
ao = evas_object_data_get(po, _part_access_obj);
@@ -146,7 +146,7 @@ _scroller_size_calc(Evas_Object *obj)
const char *action_area_height;
ELM_POPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (!sd-items) return;
@@ -269,7 +269,7 @@ _access_obj_process(Eo *obj, Eina_Bool is_access)
Evas_Object *ao;
ELM_POPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (is_access)
{
@@ -322,7 +322,7 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
if (ret) *ret = EINA_FALSE;
Elm_Popup_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, elm_wdg_theme(int_ret));
if (!int_ret) return;
@@ -417,7 +417,7 @@ _elm_popup_smart_sizing_eval(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
Elm_Popup_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-items)
{
@@ -452,7 +452,7 @@ _elm_popup_smart_sub_object_del(Eo *obj, void *_pd, va_list
*list)
Eina_Bool int_ret;
Elm_Popup_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, int_ret));
if (!int_ret) return;
@@ -547,7 +547,7 @@ _button_remove(Evas_Object *obj,
char buf[128];
ELM_POPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (!sd-button_count) return;
@@ -621,7 +621,7 @@ _list_add(Evas_Object *obj)
char style[1024];
ELM_POPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
//Table
sd-tbl = elm_table_add(obj);
@@ -885,7 +885,7 @@ _title_text_set(Evas_Object *obj,
Eina_Bool title_visibility_old, title_visibility_current;
ELM_POPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
if (sd-title_text == text) return EINA_TRUE;
@@ -934,7 +934,7 @@ _content_text_set(Evas_Object *obj,
char style[1024];
ELM_POPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
if (sd-items)
{
@@ -1044,7 +1044,7 @@ _title_icon_set(Evas_Object *obj,
Eina_Bool title_visibility_old, title_visibility_current;
ELM_POPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
if (sd-title_icon == icon) return EINA_TRUE;
title_visibility_old = (sd-title_text) || (sd-title_icon);
@@ -1073,7 +1073,7 @@ _content_set(Evas_Object *obj,
Evas_Object *content)
{
ELM_POPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
if (sd-content sd-content == content) return EINA_TRUE;
if (sd-items)
@@ -,7 +,7 @@ _action_button_set(Evas_Object *obj,
char buf[128], style[1024];
ELM_POPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (idx = ELM_POPUP_ACTION_BUTTON_MAX) return;
@@ -1296,7 +1296,7 @@ _title_icon_unset(Evas_Object *obj)
Evas_Object *icon;
ELM_POPUP_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
[EGIT] [core/elementary] master 12/59: elm_access.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=fabfacc234a0108f02c9107280764807324ab5d0
commit fabfacc234a0108f02c9107280764807324ab5d0
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:13:18 2013 +0900
elm_access.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_access.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index 398629e..578ad5c 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -472,7 +472,6 @@ _access_highlight_next_get(Evas_Object *obj,
Elm_Focus_Direction dir)
{
int type;
Evas_Object *ho, *parent, *target;
- Elm_Widget_Smart_Data *wd;
Eina_Bool ret;
target = NULL;
@@ -488,7 +487,7 @@ _access_highlight_next_get(Evas_Object *obj,
Elm_Focus_Direction dir)
/* find highlight root */
do
{
-wd = eo_data_scope_get(parent, ELM_OBJ_WIDGET_CLASS);
+ELM_WIDGET_DATA_GET_OR_RETURN(parent, wd, ret);
if (wd-highlight_root)
{
/* change highlight root */
@@ -637,7 +636,6 @@ _elm_access_highlight_cycle(Evas_Object *obj,
Elm_Focus_Direction dir)
{
int type;
Evas_Object *ho, *parent;
- Elm_Widget_Smart_Data *wd;
ho = _access_highlight_object_get(obj);
if (!ho) return;
@@ -647,7 +645,7 @@ _elm_access_highlight_cycle(Evas_Object *obj,
Elm_Focus_Direction dir)
/* find highlight root */
do
{
-wd = eo_data_scope_get(parent, ELM_OBJ_WIDGET_CLASS);
+ELM_WIDGET_DATA_GET_OR_RETURN(parent, wd);
if (wd-highlight_root)
{
/* change highlight root */
--
[EGIT] [core/elementary] master 14/59: elm_bg.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=4896de2abc1ae7d137a7239ebf9bab00f04dc05b commit 4896de2abc1ae7d137a7239ebf9bab00f04dc05b Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Oct 5 17:13:27 2013 +0900 elm_bg.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro. --- src/lib/elm_bg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c index 68e6c0e..f5cbec3 100644 --- a/src/lib/elm_bg.c +++ b/src/lib/elm_bg.c @@ -29,7 +29,7 @@ _elm_bg_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED) const char *p; Elm_Bg_Smart_Data *sd = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); if ((!sd-img) || (!sd-file)) return; if (((p = strrchr(sd-file, '.'))) (!strcasecmp(p, .edj))) return; @@ -171,7 +171,7 @@ _file_set(Eo *obj, void *_pd, va_list *list) const char *group = va_arg(*list, const char *); Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Bg_Smart_Data *sd = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); const char *p; Eina_Bool int_ret; @@ -306,7 +306,7 @@ _color_set(Eo *obj, void *_pd, va_list *list) int b = va_arg(*list, int); int a = va_arg(*list, int); Elm_Bg_Smart_Data *sd = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); // reset color if ((r == -1) (g == -1) (b == -1)) --
[EGIT] [core/elementary] master 33/59: elm_hover.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=43be921dc38df1ea13508ff58432ca2b7b430cab commit 43be921dc38df1ea13508ff58432ca2b7b430cab Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Oct 5 17:14:35 2013 +0900 elm_hover.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro. --- src/lib/elm_hover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c index 783dca9..76ef798 100644 --- a/src/lib/elm_hover.c +++ b/src/lib/elm_hover.c @@ -317,7 +317,7 @@ _elm_hover_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED) if (elm_widget_mirrored_get(obj)) ofs_x = w - (x2 - x) - w2; else ofs_x = x2 - x; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); evas_object_move(wd-resize_obj, x, y); evas_object_resize(wd-resize_obj, w, h); evas_object_size_hint_min_set(sd-offset, ofs_x, y2 - y); --
[EGIT] [core/elementary] master 21/59: elm_colorselector.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8268d103b9c84236225f5be1faf9c9d3aa2a6ac8
commit 8268d103b9c84236225f5be1faf9c9d3aa2a6ac8
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:13:53 2013 +0900
elm_colorselector.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_colorselector.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 04190a8..7902c03 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1073,7 +1073,7 @@ _elm_colorselector_smart_theme(Eo *obj, void *_pd,
va_list *list)
unsigned int v_pad = DEFAULT_VER_PAD;
Elm_Colorselector_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
@@ -1223,7 +1223,7 @@ _elm_colorselector_smart_sizing_eval(Eo *obj, void *_pd,
va_list *list EINA_UNUS
Evas_Coord minw = -1, minh = -1;
Elm_Colorselector_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_coords_finger_size_adjust(1, minw, 1, minh);
@@ -1469,7 +1469,7 @@ _elm_colorselector_smart_add(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
unsigned int v_pad = DEFAULT_VER_PAD;
Elm_Colorselector_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@@ -1912,7 +1912,7 @@ _mode_set(Eo *obj, void *_pd, va_list *list)
{
Elm_Colorselector_Mode mode = va_arg(*list, Elm_Colorselector_Mode);
Elm_Colorselector_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Object *o;
if (sd-mode == mode) return;
--
[EGIT] [core/elementary] master 50/59: elm_segment_control.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=b431c67b2f13bbeb5fce3127d54335d706395bc6 commit b431c67b2f13bbeb5fce3127d54335d706395bc6 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Oct 5 17:15:37 2013 +0900 elm_segment_control.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro. --- src/lib/elm_segment_control.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c index 6722c9e..a7f3d66 100644 --- a/src/lib/elm_segment_control.c +++ b/src/lib/elm_segment_control.c @@ -41,7 +41,7 @@ _elm_segment_control_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UN int item_count; Elm_Segment_Control_Smart_Data *sd = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); item_count = eina_list_count(sd-items); @@ -78,8 +78,7 @@ _position_items(Elm_Segment_Control_Smart_Data *sd) int item_count; Elm_Segment_Item *it; int bx, by, bw, bh, pos; - - Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(sd-obj, wd); item_count = eina_list_count(sd-items); if (item_count = 0) return; @@ -531,7 +530,7 @@ _access_state_cb(void *data, Evas_Object *obj __UNUSED__) Elm_Segment_Item *it = (Elm_Segment_Item *)data; ELM_SEGMENT_CONTROL_ITEM_CHECK_OR_RETURN(it, NULL); ELM_SEGMENT_CONTROL_DATA_GET(WIDGET(it), sd); - Elm_Widget_Smart_Data *wd = eo_data_scope_get(WIDGET(it), ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(WIDGET(it), wd, NULL); if (wd-disabled) return strdup(E_(State: Disabled)); --
[EGIT] [core/elementary] master 52/59: elm_slider.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d11bcdffcca503abce97d70ec74c822d8423058d
commit d11bcdffcca503abce97d70ec74c822d8423058d
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:15:46 2013 +0900
elm_slider.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_slider.c | 23 +++
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 15660db..162d423 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -62,7 +62,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
double posx = 0.0, posy = 0.0, pos = 0.0, val;
ELM_SLIDER_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
edje_object_part_drag_value_get
(wd-resize_obj, elm.dragable.slider, posx, posy);
@@ -110,7 +110,7 @@ _val_set(Evas_Object *obj)
(sd-horizontal !sd-inverted
pos = 1.0 - pos;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
edje_object_part_drag_value_set
(wd-resize_obj, elm.dragable.slider, pos, pos);
}
@@ -264,7 +264,7 @@ _drag_up(void *data,
if (sd-inverted) step *= -1.0;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
edje_object_part_drag_step
(wd-resize_obj, elm.dragable.slider, step, step);
}
@@ -282,7 +282,7 @@ _drag_down(void *data,
if (sd-inverted) step *= -1.0;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
edje_object_part_drag_step
(wd-resize_obj, elm.dragable.slider, step, step);
}
@@ -472,7 +472,7 @@ _elm_slider_smart_theme(Eo *obj, void *_pd, va_list *list)
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret;
Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-horizontal)
{
@@ -536,8 +536,7 @@ _elm_slider_smart_theme(Eo *obj, void *_pd, va_list *list)
static void
_elm_slider_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list
EINA_UNUSED)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
-
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
elm_coords_finger_size_adjust(1, minw, 1, minh);
@@ -578,7 +577,7 @@ _spacer_down_cb(void *data,
if (button_y 0) button_y = 0;
}
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
edje_object_part_drag_value_set
(wd-resize_obj, elm.dragable.slider,
button_x, button_y);
@@ -643,7 +642,7 @@ _spacer_move_cb(void *data,
if (button_y 0) button_y = 0;
}
-Elm_Widget_Smart_Data *wd = eo_data_scope_get(data,
ELM_OBJ_WIDGET_CLASS);
+ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
edje_object_part_drag_value_set
(wd-resize_obj, elm.dragable.slider,
button_x, button_y);
@@ -795,7 +794,7 @@ static void
_elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Slider_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@@ -977,7 +976,7 @@ _elm_slider_unit_format_set(Eo *obj, void *_pd, va_list
*list)
{
const char *units = va_arg(*list, const char *);
Elm_Slider_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eina_stringshare_replace(sd-units, units);
if (units)
@@ -1188,7 +1187,7 @@ _elm_slider_inverted_set(Eo *obj, void *_pd, va_list
*list)
{
Eina_Bool inverted = va_arg(*list, int);
Elm_Slider_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
inverted = !!inverted;
if (sd-inverted == inverted) return;
--
[EGIT] [core/elementary] master 35/59: elm_inwin.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=659c63cf856eb36e11e7f76d379a3c2090878f51
commit 659c63cf856eb36e11e7f76d379a3c2090878f51
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:14:40 2013 +0900
elm_inwin.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_inwin.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index e8d7f45..b336795 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -25,8 +25,7 @@ _elm_inwin_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED,
va_list *list EINA_
{
Evas_Object *content;
Evas_Coord minw = -1, minh = -1;
-
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
content = elm_layout_content_get(obj, NULL);
@@ -138,7 +137,7 @@ elm_win_inwin_activate(Evas_Object *obj)
static void
_elm_inwin_smart_activate(Eo *obj, void *_pd EINA_UNUSED, va_list *list
EINA_UNUSED)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
evas_object_raise(obj);
evas_object_show(obj);
--
[EGIT] [core/elementary] master 45/59: elm_plug.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=878197c9d3df58daaf2dc9f31e4d1f16a7da9745
commit 878197c9d3df58daaf2dc9f31e4d1f16a7da9745
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:15:13 2013 +0900
elm_plug.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_plug.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index 3cce46e..de28231 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -91,7 +91,7 @@ _elm_plug_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list
*list EINA_UNUSED)
{
Evas_Object *p_obj;
Ecore_Evas *ee;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@@ -143,7 +143,7 @@ static void
_image_object_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
Evas_Object **ret = va_arg(*list, Evas_Object **);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
*ret = wd-resize_obj;
}
--
[EGIT] [core/elementary] master 46/59: elm_prefs.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=fcf896909f5041e26fef5db46e164d35a420663b
commit fcf896909f5041e26fef5db46e164d35a420663b
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:15:16 2013 +0900
elm_prefs.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_prefs.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index cf52d29..28694a2 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -127,7 +127,7 @@ static Eina_Bool
_elm_prefs_save(void *data)
{
ELM_PREFS_DATA_GET(data, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd, ECORE_CALLBACK_CANCEL);
if (!sd-dirty || !sd-prefs_data) goto end;
@@ -295,7 +295,7 @@ _elm_prefs_item_changed_report(Eo *obj,
Elm_Prefs_Item_Node *it)
{
char buf[PATH_MAX];
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
snprintf(buf, sizeof(buf), %s:%s, it-page-name, it-name);
@@ -397,7 +397,7 @@ _prefs_data_autosaved_cb(void *cb_data,
void *event_info)
{
ELM_PREFS_DATA_GET(cb_data, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(cb_data,
ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(cb_data, wd);
evas_object_smart_callback_call
(wd-obj, SIG_PAGE_SAVED, event_info);
@@ -560,7 +560,7 @@ _item_changed_cb(Evas_Object *it_obj)
snprintf(buf, sizeof(buf), %s:%s, it-page-name, it-name);
ELM_PREFS_DATA_GET(it-prefs, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(it-prefs,
ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(it-prefs, wd);
if (sd-values_fetching) goto end;
--
[EGIT] [core/elementary] master 41/59: elm_panel.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f4ccc6aa9c1a47c3f2826e688607a1876bf72af2
commit f4ccc6aa9c1a47c3f2826e688607a1876bf72af2
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:15:00 2013 +0900
elm_panel.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_panel.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index fea1684..153afc0 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -35,7 +35,7 @@ _elm_panel_smart_sizing_eval(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
Evas_Coord mw = -1, mh = -1;
Elm_Panel_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-delete_me) return;
@@ -60,7 +60,7 @@ static void
_orient_set_do(Evas_Object *obj)
{
ELM_PANEL_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
switch (sd-orient)
{
@@ -131,7 +131,7 @@ _elm_panel_smart_theme(Eo *obj, void *_pd, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, elm_wdg_theme(int_ret));
if (!int_ret) return;
@@ -177,7 +177,7 @@ _elm_panel_smart_focus_next(Eo *obj, void *_pd, va_list
*list)
Eina_Bool int_ret = EINA_FALSE;
Elm_Panel_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (!sd-content) goto end;
@@ -223,7 +223,7 @@ _panel_toggle(void *data __UNUSED__,
const char *source __UNUSED__)
{
ELM_PANEL_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-hidden)
{
@@ -352,7 +352,7 @@ static void
_elm_panel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Panel_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@@ -399,7 +399,7 @@ _elm_panel_smart_del(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
Eina_List *l;
Elm_Panel_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
sd-delete_me = EINA_TRUE;
@@ -421,7 +421,7 @@ _elm_panel_smart_del(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
static void
_elm_panel_smart_access(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_Bool is_access = va_arg(*list, int);
if (is_access)
--
[EGIT] [core/elementary] master 15/59: elm_box.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0ecc4b575e9da69bcdd6197a6463a56dd9d30191
commit 0ecc4b575e9da69bcdd6197a6463a56dd9d30191
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:13:31 2013 +0900
elm_box.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_box.c | 45 ++---
1 file changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index b40c8f1..f51f00b 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -72,8 +72,7 @@ _elm_box_smart_focus_next(Eo *obj, void *_pd EINA_UNUSED,
va_list *list)
list_data_get = eina_list_data_get;
else
{
-Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj,
ELM_OBJ_WIDGET_CLASS);
-
+ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Object_Box_Data *bd =
evas_object_smart_data_get(wd-resize_obj);
@@ -112,7 +111,7 @@ _elm_box_smart_focus_direction(Eo *obj EINA_UNUSED, void
*_pd EINA_UNUSED, va_li
list_data_get = eina_list_data_get;
else
{
-Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj,
ELM_OBJ_WIDGET_CLASS);
+ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Object_Box_Data *bd =
evas_object_smart_data_get(wd-resize_obj);
@@ -136,7 +135,7 @@ _elm_box_smart_theme(Eo *obj, void *_pd EINA_UNUSED,
va_list *list)
eo_do_super(obj, MY_CLASS, elm_wdg_theme(int_ret));
if (!int_ret) return;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
evas_object_smart_calculate(wd-resize_obj);
if (ret) *ret = EINA_TRUE;
@@ -149,7 +148,7 @@ _sizing_eval(Evas_Object *obj)
Evas_Coord w, h;
ELM_BOX_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-delete_me)
return;
@@ -395,7 +394,7 @@ _transition_layout_animation_exec(Evas_Object *obj,
static void
_elm_box_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_widget_resize_object_set(obj,
evas_object_box_add(evas_object_evas_get(obj)));
@@ -427,7 +426,7 @@ _elm_box_smart_del(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
Elm_Box_Smart_Data *sd = _pd;
sd-delete_me = EINA_TRUE;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
evas_object_event_callback_del_full
(wd-resize_obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_on_size_hints_changed, obj);
@@ -478,7 +477,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list)
{
Eina_Bool horizontal = va_arg(*list, int);
Elm_Box_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
sd-horizontal = !!horizontal;
evas_object_smart_calculate(wd-resize_obj);
@@ -514,7 +513,7 @@ _homogeneous_set(Eo *obj, void *_pd, va_list *list)
{
Eina_Bool homogeneous = va_arg(*list, int);
Elm_Box_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
sd-homogeneous = !!homogeneous;
evas_object_smart_calculate(wd-resize_obj);
@@ -550,7 +549,7 @@ _pack_start(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
Evas_Object *subobj = va_arg(*list, Evas_Object *);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_widget_sub_object_add(obj, subobj);
evas_object_box_prepend(wd-resize_obj, subobj);
@@ -568,7 +567,7 @@ static void
_pack_end(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
Evas_Object *subobj = va_arg(*list, Evas_Object *);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_widget_sub_object_add(obj, subobj);
evas_object_box_append(wd-resize_obj, subobj);
@@ -588,7 +587,7 @@ _pack_before(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
Evas_Object *subobj = va_arg(*list, Evas_Object *);
Evas_Object *before = va_arg(*list, Evas_Object *);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_widget_sub_object_add(obj, subobj);
@@ -610,7 +609,7 @@ _pack_after(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
Evas_Object *subobj = va_arg(*list, Evas_Object *);
Evas_Object *after = va_arg(*list, Evas_Object *);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_widget_sub_object_add(obj, subobj);
[EGIT] [core/elementary] master 27/59: elm_flipselector.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=44fde8b9ca45ef61ca6ff8753fc850fc70baed45
commit 44fde8b9ca45ef61ca6ff8753fc850fc70baed45
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:14:15 2013 +0900
elm_flipselector.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_flipselector.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index 167eef0..023bdd6 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -53,7 +53,7 @@ _elm_flipselector_smart_sizing_eval(Eo *obj, void *_pd,
va_list *list EINA_UNUSE
Evas_Coord minw = -1, minh = -1, w, h;
Elm_Flipselector_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-evaluating) return;
@@ -97,7 +97,7 @@ _update_view(Evas_Object *obj)
Elm_Flipselector_Item *item;
ELM_FLIPSELECTOR_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
label = NULL;
item = DATA_GET(sd-current);
@@ -271,7 +271,7 @@ _send_msg(Elm_Flipselector_Smart_Data *sd,
char *label)
{
Edje_Message_String msg;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj,
ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(sd-obj, wd);
msg.str = label;
edje_object_message_send
@@ -366,7 +366,7 @@ _elm_flipselector_smart_theme(Eo *obj, void *_pd, va_list
*list)
if (ret) *ret = EINA_FALSE;
Elm_Flipselector_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, elm_wdg_theme(int_ret));
if (!int_ret) return;
--
[EGIT] [core/elementary] master 49/59: elm_scroller.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6c841e3a1883c493bd7e715f57c5a710d78c38e6
commit 6c841e3a1883c493bd7e715f57c5a710d78c38e6
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:15:27 2013 +0900
elm_scroller.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_scroller.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 5dce8f7..52b575e 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -319,7 +319,7 @@ _elm_scroller_smart_sizing_eval(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
double xw = 0.0, yw = 0.0;
Elm_Scroller_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-content)
{
@@ -745,7 +745,7 @@ static void
_elm_scroller_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Scroller_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Coord minw, minh;
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
@@ -1238,7 +1238,7 @@ static void
_propagate_events_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
Eina_Bool propagation = va_arg(*list, int);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
evas_object_propagate_events_set(wd-resize_obj, propagation);
}
@@ -1257,7 +1257,7 @@ static void
_propagate_events_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
*ret = evas_object_propagate_events_get(wd-resize_obj);
}
--
[EGIT] [core/elementary] master 55/59: elm_thumb.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=5c0d6f47384b3ed1960e02f50cfd85be4e00d0f1
commit 5c0d6f47384b3ed1960e02f50cfd85be4e00d0f1
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:15:56 2013 +0900
elm_thumb.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_thumb.c | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index a35bba9..117042f 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -95,8 +95,7 @@ _thumb_ready_inform(Elm_Thumb_Smart_Data *sd,
{
Evas_Coord mw, mh;
Evas_Coord aw, ah;
-
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj,
ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(sd-obj, wd);
if ((sd-is_video) (sd-thumb.format == ETHUMB_THUMB_EET))
{
@@ -206,8 +205,8 @@ _thumb_finish(Elm_Thumb_Smart_Data *sd,
Eina_List *l, *ll;
Evas *evas;
int r;
+ ELM_WIDGET_DATA_GET_OR_RETURN(sd-obj, wd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj,
ELM_OBJ_WIDGET_CLASS);
evas = evas_object_evas_get(sd-obj);
if ((sd-view) (sd-is_video ^ sd-was_video))
{
@@ -358,7 +357,7 @@ _on_ethumb_thumb_error(Ethumb_Client *client __UNUSED__,
ERR(could not generate thumbnail for %s (key: %s),
sd-thumb.file, sd-thumb.key ? sd-thumb.key : );
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
elm_layout_signal_emit
(wd-resize_obj, EDJE_SIGNAL_GENERATE_ERROR, elm);
evas_object_smart_callback_call
@@ -398,7 +397,7 @@ _thumb_start(Elm_Thumb_Smart_Data *sd)
if (!sd-file) return;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj,
ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(sd-obj, wd);
elm_layout_signal_emit
(wd-resize_obj, EDJE_SIGNAL_PULSE_START, elm);
elm_layout_signal_emit
@@ -458,7 +457,7 @@ _on_die_cb(void *data __UNUSED__,
static void
_thumb_show(Elm_Thumb_Smart_Data *sd)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(sd-obj,
ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(sd-obj, wd);
evas_object_show(wd-resize_obj);
if (!_elm_ethumb_client)
@@ -498,7 +497,7 @@ _elm_thumb_smart_hide(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
#else
(void) _pd;
#endif
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
@@ -560,7 +559,7 @@ _elm_thumb_smart_theme(Eo *obj, void *_pd __UNUSED__,
va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, elm_wdg_theme(int_ret));
if (!int_ret) return;
@@ -595,7 +594,7 @@ elm_need_ethumb(void)
static void
_elm_thumb_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
--
[EGIT] [core/elementary] master 36/59: elm_label.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=03479224957d47ccdac89813fe1cd92d8c57819b
commit 03479224957d47ccdac89813fe1cd92d8c57819b
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:14:43 2013 +0900
elm_label.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_label.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 32fa2bb..05b59b3 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -33,7 +33,7 @@ static void
_recalc(void *data)
{
ELM_LABEL_DATA_GET(data, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
Evas_Coord minw = -1, minh = -1;
Evas_Coord resw;
@@ -81,7 +81,7 @@ _label_slide_change(Evas_Object *obj)
int plainlen = 0;
ELM_LABEL_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
edje_object_signal_emit(wd-resize_obj, elm,state,slide,stop, elm);
@@ -162,7 +162,7 @@ _elm_label_smart_theme(Eo *obj, void *_pd, va_list *list)
Eina_Bool int_ret = EINA_FALSE;
Elm_Label_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
evas_event_freeze(evas_object_evas_get(obj));
@@ -186,7 +186,7 @@ _elm_label_smart_sizing_eval(Eo *obj, void *_pd
EINA_UNUSED, va_list *list EINA_
Evas_Coord resw, resh;
ELM_LABEL_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-linewrap)
{
@@ -324,7 +324,7 @@ static void
_elm_label_smart_text_set(Eo *obj, void *_pd, va_list *list)
{
Elm_Label_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
const char *part = va_arg(*list, const char *);
const char *label = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
@@ -379,7 +379,7 @@ static void
_elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Label_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
@@ -449,7 +449,7 @@ _line_wrap_set(Eo *obj, void *_pd, va_list *list)
int len;
Elm_Label_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-linewrap == wrap) return;
@@ -516,7 +516,7 @@ _wrap_width_set(Eo *obj, void *_pd, va_list *list)
{
Evas_Coord w = va_arg(*list, Evas_Coord);
Elm_Label_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (w 0) w = 0;
@@ -563,7 +563,7 @@ _ellipsis_set(Eo *obj, void *_pd, va_list *list)
const char *text;
Elm_Label_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-ellipsis == ellipsis) return;
sd-ellipsis = ellipsis;
--
[EGIT] [core/elementary] master 48/59: elm_radio.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=083408b05f7c4f800959540d80fa2fd5e3439a6a
commit 083408b05f7c4f800959540d80fa2fd5e3439a6a
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:15:22 2013 +0900
elm_radio.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_radio.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index a3e7173..585b8f7 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -179,7 +179,7 @@ static void
_elm_radio_smart_theme(Eo *obj, void *_pd, va_list *list)
{
Elm_Radio_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
@@ -225,8 +225,7 @@ _elm_radio_smart_sizing_eval(Eo *obj, void *_pd
EINA_UNUSED, va_list *list EINA_
{
Evas_Coord minw = -1, minh = -1;
-
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_coords_finger_size_adjust(1, minw, 1, minh);
edje_object_size_min_restricted_calc
@@ -272,7 +271,7 @@ _elm_radio_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
{
Elm_Radio_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
--
[EGIT] [core/elementary] master 54/59: elm_spinner.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=00753fbebe52927e0e6c42c13a975a131f7153c4
commit 00753fbebe52927e0e6c42c13a975a131f7153c4
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:15:53 2013 +0900
elm_spinner.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_spinner.c | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 7287828..6abeb23 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -160,7 +160,7 @@ _val_set(Evas_Object *obj)
double pos = 0.0;
ELM_SPINNER_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-val_max sd-val_min)
pos = ((sd-val - sd-val_min) / (sd-val_max - sd-val_min));
@@ -182,7 +182,7 @@ _drag_cb(void *data,
Eina_Bool ret = EINA_FALSE;
ELM_SPINNER_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-entry_visible) return;
eo_do((Eo *)wd-resize_obj,
@@ -213,7 +213,7 @@ _drag_stop_cb(void *data,
const char *source __UNUSED__)
{
ELM_SPINNER_DATA_GET(data, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
sd-drag_start_val = 0;
edje_object_part_drag_value_set
@@ -415,8 +415,7 @@ static void
_elm_spinner_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list
EINA_UNUSED)
{
Evas_Coord minw = -1, minh = -1;
-
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_coords_finger_size_adjust(1, minw, 1, minh);
edje_object_size_min_restricted_calc
@@ -655,7 +654,7 @@ static void
_elm_spinner_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Spinner_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
--
[EGIT] [core/elementary] master 26/59: elm_entry.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=74d5a445d872f76826dd1b295f19c0fac9fea6c4 commit 74d5a445d872f76826dd1b295f19c0fac9fea6c4 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Oct 5 17:14:12 2013 +0900 elm_entry.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro. --- src/lib/elm_entry.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 0a94c75..8f8fa34 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -469,7 +469,7 @@ _elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Elm_Entry_Smart_Data *sd = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Eina_Bool int_ret = EINA_FALSE; eo_do_super(obj, MY_CLASS, elm_wdg_theme(int_ret)); @@ -2583,7 +2583,7 @@ _elm_entry_smart_callback_add(Eo *obj, void *_pd, va_list *list) Evas_Object *ro; Elm_Entry_Smart_Data *sd = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ro = wd-resize_obj; @@ -2613,7 +2613,7 @@ _elm_entry_smart_callback_del(Eo *obj, void *_pd, va_list *list) Evas_Object *ro; Elm_Entry_Smart_Data *sd = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ro = wd-resize_obj; @@ -2955,7 +2955,7 @@ _elm_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) #endif Elm_Entry_Smart_Data *priv = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); --
[EGIT] [core/elementary] master 24/59: elm_dayselector.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9ff33d9882484c5b21e540a4c2b1ecdb9decc466
commit 9ff33d9882484c5b21e540a4c2b1ecdb9decc466
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:14:03 2013 +0900
elm_dayselector.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_dayselector.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index 0190050..fca7410 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -34,8 +34,7 @@ static void
_elm_dayselector_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list
*list EINA_UNUSED)
{
Evas_Coord min_w = -1, min_h = -1;
-
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_coords_finger_size_adjust(ELM_DAYSELECTOR_MAX, min_w, 1, min_h);
edje_object_size_min_restricted_calc
@@ -532,7 +531,7 @@ static void
_week_start_set(Eo *obj, void *_pd, va_list *list)
{
Elm_Dayselector_Day day = va_arg(*list, Elm_Dayselector_Day);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_List *l;
char buf[1024];
Elm_Dayselector_Item *it;
--
[EGIT] [core/elementary] master 58/59: elm_web2.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=00141eb19a879c64d24e773d0dec6e6440ad6c51
commit 00141eb19a879c64d24e773d0dec6e6440ad6c51
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:16:05 2013 +0900
elm_web2.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_web2.c | 32
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index fad12af..02764e3 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -187,7 +187,7 @@ static void
_webkit_view_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
Evas_Object **ret = va_arg(*list, Evas_Object **);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
*ret = wd-resize_obj;
}
@@ -363,7 +363,7 @@ _useragent_set(Eo *obj, void *_pd EINA_UNUSED, va_list
*list)
const char *user_agent = va_arg(*list, const char *);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
ewk_view_user_agent_set(wd-resize_obj, user_agent);
#else
@@ -387,7 +387,7 @@ _useragent_get(Eo *obj, void *_pd EINA_UNUSED, va_list
*list)
const char **ret = va_arg(*list, const char **);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
*ret = ewk_view_user_agent_get(wd-resize_obj);
#else
@@ -419,7 +419,7 @@ elm_web_url_set(Evas_Object *obj,
static void
_url_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
const char *url = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
@@ -451,7 +451,7 @@ static void
_url_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
const char **ret = va_arg(*list, const char **);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
*ret = ewk_view_url_get(wd-resize_obj);
}
@@ -468,7 +468,7 @@ static void
_title_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
const char **ret = va_arg(*list, const char **);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
*ret = ewk_view_title_get(wd-resize_obj);
}
@@ -764,7 +764,7 @@ _load_progress_get(Eo *obj, void *_pd EINA_UNUSED, va_list
*list)
*ret = -1.0;
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
*ret = ewk_view_load_progress_get(wd-resize_obj);
#else
@@ -788,7 +788,7 @@ _stop(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
int_ret = ewk_view_stop(wd-resize_obj);
#else
@@ -814,7 +814,7 @@ _reload(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
int_ret = ewk_view_reload(wd-resize_obj);
#else
@@ -840,7 +840,7 @@ _reload_full(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
int_ret = ewk_view_reload_bypass_cache(wd-resize_obj);
#else
@@ -866,7 +866,7 @@ _back(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
int_ret = ewk_view_back(wd-resize_obj);
#else
@@ -892,7 +892,7 @@ _forward(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
int_ret = ewk_view_forward(wd-resize_obj);
#else
@@ -923,7 +923,7 @@ _navigate(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
#ifdef HAVE_ELEMENTARY_WEB
Ewk_Back_Forward_List *history;
Ewk_Back_Forward_List_Item *item = NULL;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
history = ewk_view_back_forward_list_get(wd-resize_obj);
if (history)
@@ -955,7 +955,7 @@
[EGIT] [core/elementary] master 18/59: elm_calendar.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=cc37e008d29bc70dfde5b07ba3f616bbd3993a0e
commit cc37e008d29bc70dfde5b07ba3f616bbd3993a0e
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:13:43 2013 +0900
elm_calendar.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_calendar.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index ab38bce..5fec575 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -67,8 +67,7 @@ _elm_calendar_smart_sizing_eval(Eo *obj, void *_pd
EINA_UNUSED, va_list *list EI
{
Evas_Coord minw = -1, minh = -1;
-
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
// 7x8 (1 month+year, days, 6 dates.)
elm_coords_finger_size_adjust(7, minw, 8, minh);
@@ -946,7 +945,7 @@ _elm_calendar_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
int i, t;
Elm_Calendar_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
--
[EGIT] [core/elementary] master 31/59: elm_glview.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=879a6571e8e65a48bbe253a24afd309356dec839
commit 879a6571e8e65a48bbe253a24afd309356dec839
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:14:28 2013 +0900
elm_glview.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_glview.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index fe0da8a..bc791d0 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -39,7 +39,7 @@ _elm_glview_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED,
va_list *list)
{
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_Bool int_ret = EINA_FALSE;
eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(int_ret));
@@ -57,7 +57,7 @@ static void
_glview_update_surface(Evas_Object *obj)
{
ELM_GLVIEW_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (!sd) return;
if (sd-surface)
@@ -163,7 +163,7 @@ static void
_set_render_policy_callback(Evas_Object *obj)
{
ELM_GLVIEW_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
switch (sd-render_policy)
{
@@ -333,7 +333,7 @@ _mode_set(Eo *obj, void *_pd, va_list *list)
Elm_GLView_Mode mode = va_arg(*list, Elm_GLView_Mode);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
Elm_Glview_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
// Set the configs
if (mode ELM_GLVIEW_ALPHA) sd-config-color_format = EVAS_GL_RGBA_;
@@ -557,7 +557,7 @@ static void
_changed_set(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Glview_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
evas_object_image_pixels_dirty_set
(wd-resize_obj, EINA_TRUE);
--
[EGIT] [core/elementary] master 20/59: elm_clock.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=b4a696e34f7af6e5fa01bd60f7fe43d8819d4583
commit b4a696e34f7af6e5fa01bd60f7fe43d8819d4583
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:13:50 2013 +0900
elm_clock.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_clock.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index a051708..6091df6 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -339,7 +339,7 @@ static void
_time_update(Evas_Object *obj)
{
ELM_CLOCK_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Edje_Message_Int msg;
const char *style = elm_widget_style_get(obj);
@@ -664,7 +664,7 @@ static void
_elm_clock_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Clock_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@@ -785,7 +785,7 @@ _elm_clock_smart_focus_next(Eo *obj, void *_pd EINA_UNUSED,
va_list *list)
static void
_access_obj_process(Evas_Object *obj, Eina_Bool is_access)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
/* clock object */
evas_object_propagate_events_set(obj, !is_access);
--
[EGIT] [core/elementary] master 59/59: all: Applied ELM_WIDGET_DATA_GET_OR_RETURN macro to more widgets.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=ad8a00cf343786497f12ef6efc1c1de38d363196 commit ad8a00cf343786497f12ef6efc1c1de38d363196 Merge: d9e8128 00141eb Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Oct 5 17:16:55 2013 +0900 all: Applied ELM_WIDGET_DATA_GET_OR_RETURN macro to more widgets. src/lib/elc_ctxpopup.c| 8 ++-- src/lib/elc_fileselector.c| 4 +- src/lib/elc_fileselector_button.c | 2 +- src/lib/elc_fileselector_entry.c | 4 +- src/lib/elc_hoversel.c| 2 +- src/lib/elc_multibuttonentry.c| 6 +-- src/lib/elc_naviframe.c | 2 +- src/lib/elc_player.c | 3 +- src/lib/elc_popup.c | 32 src/lib/elm_access.c | 6 +-- src/lib/elm_actionslider.c| 18 - src/lib/elm_bg.c | 6 +-- src/lib/elm_box.c | 45 +++--- src/lib/elm_bubble.c | 8 ++-- src/lib/elm_button.c | 4 +- src/lib/elm_calendar.c| 5 +-- src/lib/elm_check.c | 9 ++--- src/lib/elm_clock.c | 6 +-- src/lib/elm_colorselector.c | 8 ++-- src/lib/elm_conform.c | 9 + src/lib/elm_datetime.c| 6 +-- src/lib/elm_dayselector.c | 5 +-- src/lib/elm_diskselector.c| 6 +-- src/lib/elm_entry.c | 8 ++-- src/lib/elm_flipselector.c| 8 ++-- src/lib/elm_frame.c | 12 +++--- src/lib/elm_gengrid.c | 2 +- src/lib/elm_genlist.c | 4 +- src/lib/elm_glview.c | 10 ++--- src/lib/elm_grid.c| 4 +- src/lib/elm_hover.c | 2 +- src/lib/elm_index.c | 15 src/lib/elm_inwin.c | 5 +-- src/lib/elm_label.c | 18 - src/lib/elm_layout.c | 80 +++ src/lib/elm_list.c| 6 +-- src/lib/elm_map.c | 23 ++- src/lib/elm_mapbuf.c | 6 +-- src/lib/elm_menu.c| 2 +- src/lib/elm_panel.c | 16 src/lib/elm_panes.c | 8 ++-- src/lib/elm_photo.c | 8 ++-- src/lib/elm_photocam.c| 17 - src/lib/elm_plug.c| 4 +- src/lib/elm_prefs.c | 8 ++-- src/lib/elm_progressbar.c | 13 +++ src/lib/elm_radio.c | 7 ++-- src/lib/elm_scroller.c| 8 ++-- src/lib/elm_segment_control.c | 7 ++-- src/lib/elm_separator.c | 3 +- src/lib/elm_slider.c | 23 ++- src/lib/elm_slideshow.c | 4 +- src/lib/elm_spinner.c | 11 +++--- src/lib/elm_thumb.c | 17 - src/lib/elm_toolbar.c | 8 ++-- src/lib/elm_video.c | 2 +- src/lib/elm_web2.c| 32 57 files changed, 289 insertions(+), 316 deletions(-) --
[EGIT] [core/elementary] master 40/59: elm_menu.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=428bda55b7f9a26e1b64a9649fad99189da90b7a
commit 428bda55b7f9a26e1b64a9649fad99189da90b7a
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:14:55 2013 +0900
elm_menu.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_menu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 0a23e7b..5a8d45d 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -345,7 +345,7 @@ _parent_del_cb(void *data,
void *event_info __UNUSED__)
{
ELM_MENU_DATA_GET(data, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
evas_object_event_callback_del_full
(obj, EVAS_CALLBACK_RESIZE, _parent_resize_cb, wd-obj);
--
[EGIT] [core/elementary] master 25/59: elm_diskselector.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=fbc02aee3601e9d62a9d7efeaeb099d969ed095f
commit fbc02aee3601e9d62a9d7efeaeb099d969ed095f
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:14:08 2013 +0900
elm_diskselector.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_diskselector.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 7b4c21e..92f495a 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -292,9 +292,8 @@ _resize_cb(void *data __UNUSED__,
void *event_info __UNUSED__)
{
Evas_Coord w, h;
-
ELM_DISKSELECTOR_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if ((sd-minw == -1) (sd-minh == -1))
elm_coords_finger_size_adjust(6, sd-minw, 1, sd-minh);
@@ -880,8 +879,7 @@ _elm_diskselector_smart_on_focus(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
-
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(int_ret));
if (!int_ret) return;
--
[EGIT] [core/elementary] master 28/59: elm_frame.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ef1faef7e6c56ad91dc13528a3b2197a183d92ce
commit ef1faef7e6c56ad91dc13528a3b2197a183d92ce
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:14:19 2013 +0900
elm_frame.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_frame.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index 3c6d668..a72816a 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -36,7 +36,7 @@ static void
_sizing_eval(Evas_Object *obj,
Elm_Frame_Smart_Data *sd EINA_UNUSED)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Coord minw = -1, minh = -1;
Evas_Coord cminw = -1, cminh = -1;
@@ -122,7 +122,7 @@ _on_recalc_done(void *data,
const char *src __UNUSED__)
{
ELM_FRAME_DATA_GET(data, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
evas_object_smart_callback_del
(wd-resize_obj, recalc, _recalc);
@@ -138,7 +138,7 @@ _on_frame_clicked(void *data,
const char *src __UNUSED__)
{
ELM_FRAME_DATA_GET(data, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
if (sd-anim) return;
@@ -171,7 +171,7 @@ _elm_frame_smart_calculate(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
static void
_elm_frame_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@@ -271,7 +271,7 @@ _collapse_set(Eo *obj, void *_pd, va_list *list)
{
Eina_Bool collapse = va_arg(*list, int);
Elm_Frame_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
collapse = !!collapse;
if (sd-collapsed == collapse) return;
@@ -297,7 +297,7 @@ _collapse_go(Eo *obj, void *_pd, va_list *list)
{
Eina_Bool collapse = va_arg(*list, int);
Elm_Frame_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
collapse = !!collapse;
if (sd-collapsed == collapse) return;
--
[EGIT] [core/elementary] master 30/59: elm_genlist.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d032aeb7b72bca1ecda020435de04156aff3d437
commit d032aeb7b72bca1ecda020435de04156aff3d437
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:14:25 2013 +0900
elm_genlist.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_genlist.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index bdccdb7..7ac1965 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -561,7 +561,7 @@ _elm_genlist_smart_sizing_eval(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
Evas_Coord vmw = 0, vmh = 0;
Elm_Genlist_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-on_sub_del) return;;
@@ -4851,7 +4851,7 @@ static void
_elm_genlist_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Genlist_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Elm_Genlist_Pan_Smart_Data *pan_data;
Evas_Coord minw, minh;
int i;
--
[EGIT] [core/elementary] master 57/59: elm_video.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=49b2e00a64c1ddb60d73157f28cd17338c71bbe1
commit 49b2e00a64c1ddb60d73157f28cd17338c71bbe1
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:16:02 2013 +0900
elm_video.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_video.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index db5972d..2fd5eb7 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -112,7 +112,7 @@ _elm_video_smart_sizing_eval(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
{
#ifdef HAVE_EMOTION
Elm_Video_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Coord minw = -1, minh = -1;
Evas_Coord w, h;
--
[EGIT] [core/elementary] master 43/59: elm_photo.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6b5af1dbd6b2fbb95fbcc73d96424acb644e0e08
commit 6b5af1dbd6b2fbb95fbcc73d96424acb644e0e08
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:15:06 2013 +0900
elm_photo.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_photo.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 3d7cd63..9c28089 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -30,7 +30,7 @@ _sizing_eval(Evas_Object *obj)
double scale;
ELM_PHOTO_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-size = 0) return;
@@ -54,7 +54,7 @@ _elm_photo_smart_theme(Eo *obj, void *_pd, va_list *list)
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
Elm_Photo_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, elm_wdg_theme(int_ret));
if (!int_ret) return;
@@ -84,7 +84,7 @@ _icon_move_resize_cb(void *data,
Evas_Coord w, h;
ELM_PHOTO_DATA_GET(data, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-fill_inside)
{
@@ -253,7 +253,7 @@ static void
_elm_photo_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Photo_Smart_Data *priv = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
--
[EGIT] [core/elementary] master 56/59: elm_toolbar.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=5151ee383c79c4de9666d896be3da6cd79e81977
commit 5151ee383c79c4de9666d896be3da6cd79e81977
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:15:58 2013 +0900
elm_toolbar.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_toolbar.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 27f043a..7d0c8d9 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -581,7 +581,7 @@ static void
_elm_toolbar_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
ELM_TOOLBAR_DATA_GET(obj, sd);
Eina_Bool int_ret = EINA_FALSE;
@@ -798,7 +798,7 @@ end:
static int
_elm_toolbar_icon_size_get(Evas_Object *obj)
{
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
const char *icon_size = edje_object_data_get
(wd-resize_obj, icon_size);
@@ -1088,7 +1088,7 @@ _sizing_eval(Evas_Object *obj)
Evas_Coord w, h;
ELM_TOOLBAR_DATA_GET(obj, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
evas_object_smart_need_recalculate_set(sd-bx, EINA_TRUE);
evas_object_smart_calculate(sd-bx);
@@ -1159,7 +1159,7 @@ _elm_toolbar_smart_theme(Eo *obj, void *_pd, va_list
*list)
Elm_Toolbar_Item *it;
double scale = 0;
Elm_Toolbar_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
--
Re: [E-devel] Git, merges, and better work-flows
On Fri, Oct 4, 2013 at 11:48 PM, Tom Hacohen tom.haco...@samsung.comwrote: On 04/10/13 15:40, Michael Blumenkrantz wrote: On Fri, 04 Oct 2013 15:18:46 +0100 Tom Hacohen tom.haco...@samsung.com wrote: On 02/10/13 16:17, Tom Hacohen wrote: Hey guys, I would like to suggest a new work-flow. This work-flow will not be mandatory, but just an allowed alternative to the current commit to master approach. At the moment we do not allow merges, at all. This was to prevent people from littering the log with their inability to rebase (git pull --rebase) their local changes on top of the existing commits. This will still remain the same. I'd like to suggest using merges to our advantage. I suggest the following: For fixes, small features, and the like, do the same as you do now. Commit and push to master. For bigger features, rewrites, or any form of a few commits that are tied together by being part of the same set, do as follows (it's obviously simpler than that, I listed everything to over-simplify things): 1. Create a branch (either local or remote) for your change. 2. Work on that branch. 3. When ready, instead of pushing to master: 3. rebase over master (git fetch; git rebase origin/master). 4. switch to master (git checkout master) 6. git merge --no-ff your-feature-branch-name 7. Describe your feature in the commit message. 8. push to master (git push or git push origin master). I've done a few example commits on https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/ This work-flow lets us have linear history, while having feature-sets show as a single merge that can easily be reverted, provide a good description about a feature and the commits that introduced it and I find generally easier for the eye. There are also technical advantages, for example, if you run git log --first-parent you will only see the merge commits, cleaning the log from all the fluff involving a feature letting you just see the feature. Another advantage is that git bisect will not go inside the merged branch unless the issue was introduced there. Please feel free to inspect my repo, more specifically, the log: https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/log/ To see how it looks. Important note: commits on the merge branch should be treated as if they are on master, that is, don't use this as an excuse to make ugly commits with bad commit messages. Again: I'm not trying to make it mandatory, just to allow this sort of merges. Please let me know what you think. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel So, is this a go? May I write up some documentation about it and start doing it? -- Tom. I think you probably could have started documenting it at any point to help those who are interested. I already documented enough to explain the idea, and a more detailed explanation is available at the link Peter gave. I will only format it and actually put it in our documentation if actually agreed upon. Would be a waste of time otherwise. Well, your explanation in your first email was quite enough for me. I just made a merge branch commit what you described above. https://git.enlightenment.org/core/elementary.git/commit/?id=ad8a00cf343786497f12ef6efc1c1de38d363196 It was quite easy and clear to me. Thanks for the suggestion. Daniel Juyung Seo (SeoZ) -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See
[EGIT] [core/elementary] master 03/05: elm_web.c: use ECORE_CALLBACK_RENEW instead of EINA_TRUE for timer/animator's callbacks return value.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=a9baa81cf47f4eb9f5af8b1d2b63f4e412f002e2 commit a9baa81cf47f4eb9f5af8b1d2b63f4e412f002e2 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Oct 5 17:25:22 2013 +0900 elm_web.c: use ECORE_CALLBACK_RENEW instead of EINA_TRUE for timer/animator's callbacks return value. --- src/lib/elm_web.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c index 7c03797..39d40e9 100644 --- a/src/lib/elm_web.c +++ b/src/lib/elm_web.c @@ -234,7 +234,7 @@ _view_pan_animator(void *data) sd-mouse.y = y; end: - return EINA_TRUE; + return ECORE_CALLBACK_RENEW; } static void @@ -1100,7 +1100,7 @@ _bring_in_anim_cb(void *data, sd-bring_in.animator = NULL; } - return EINA_TRUE; + return ECORE_CALLBACK_RENEW; } #endif --
[EGIT] [core/elementary] master 01/05: elm_web.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6461914ecd1a89d5f01f087db026aa7962a0de0d
commit 6461914ecd1a89d5f01f087db026aa7962a0de0d
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:22:32 2013 +0900
elm_web.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
src/lib/elm_web.c | 70 +++
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index aea4489..7c03797 100644
--- a/src/lib/elm_web.c
+++ b/src/lib/elm_web.c
@@ -114,7 +114,7 @@ _elm_web_smart_theme(Eo *obj, void *_pd EINA_UNUSED,
va_list *list)
const Eina_List *themes;
char *view_theme = NULL;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
eo_do_super(obj, MY_CLASS, elm_wdg_theme(int_ret));
if (!int_ret) return;
@@ -156,7 +156,7 @@ _elm_web_smart_on_focus(Eo *obj, void *_pd, va_list *list)
Evas_Object *top;
Elm_Web_Smart_Data *sd = _pd;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_Bool int_ret = EINA_FALSE;
eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(int_ret));
@@ -897,7 +897,7 @@ static Eina_Bool
_reset_zoom_timer_cb(void *data)
{
ELM_WEB_DATA_GET(data, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
sd-zoom.timer = ecore_timer_add(0.0, _restore_zoom_mode_timer_cb, data);
ewk_view_zoom_set(wd-resize_obj, 1.0, 0, 0);
@@ -1080,7 +1080,7 @@ _bring_in_anim_cb(void *data,
double pos)
{
ELM_WEB_DATA_GET(data, sd);
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(data, wd, ECORE_CALLBACK_CANCEL);
Evas_Object *frame =
ewk_view_frame_main_get(wd-resize_obj);
@@ -1240,7 +1240,7 @@ _webkit_view_get(Eo *obj, void *_pd EINA_UNUSED, va_list
*list)
{
Evas_Object **ret = va_arg(*list, Evas_Object **);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
*ret = wd-resize_obj;
#else
@@ -1421,7 +1421,7 @@ _useragent_set(Eo *obj, void *_pd EINA_UNUSED, va_list
*list)
{
const char *user_agent = va_arg(*list, const char *);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
ewk_view_setting_user_agent_set
(wd-resize_obj, user_agent);
@@ -1446,7 +1446,7 @@ _useragent_get(Eo *obj, void *_pd EINA_UNUSED, va_list
*list)
const char **ret = va_arg(*list, const char **);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
*ret = ewk_view_setting_user_agent_get(wd-resize_obj);
#else
@@ -1530,7 +1530,7 @@ _url_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
#ifdef HAVE_ELEMENTARY_WEB
Eina_Bool int_ret = EINA_FALSE;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
int_ret = ewk_view_uri_set(wd-resize_obj, url);
if (ret) *ret = int_ret;
@@ -1563,7 +1563,7 @@ _url_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
const char **ret = va_arg(*list, const char **);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
*ret = ewk_view_uri_get(wd-resize_obj);
#else
@@ -1589,7 +1589,7 @@ _title_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
#ifdef HAVE_ELEMENTARY_WEB
const Ewk_Text_With_Direction *txt;
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
txt = ewk_view_title_get(wd-resize_obj);
if (txt) *ret = txt-string;
@@ -1619,7 +1619,7 @@ _bg_color_set(Eo *obj, void *_pd EINA_UNUSED, va_list
*list)
int b = va_arg(*list, int);
int a = va_arg(*list, int);
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
ewk_view_bg_color_set(wd-resize_obj, r, g, b, a);
#else
@@ -1655,7 +1655,7 @@ _bg_color_get(Eo *obj, void *_pd EINA_UNUSED, va_list
*list)
if (b) *b = 0;
if (a) *a = 0;
#ifdef HAVE_ELEMENTARY_WEB
- Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
return ewk_view_bg_color_get(wd-resize_obj, r, g, b, a);
#else
@@ -1677,7 +1677,7 @@ _selection_get(Eo *obj, void *_pd EINA_UNUSED, va_list
*list)
{
const char **ret = va_arg(*list, const char **);
#ifdef HAVE_ELEMENTARY_WEB
-
[EGIT] [core/elementary] master 02/05: elm_win.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=dbf5fa599c5dfd12d472a321c9c2a2b5fee79d60 commit dbf5fa599c5dfd12d472a321c9c2a2b5fee79d60 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Sat Oct 5 17:22:41 2013 +0900 elm_win.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro. --- src/lib/elm_win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 5dfe0f6..cdf43f5 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -1067,7 +1067,7 @@ _elm_win_smart_focus_next(Eo *obj, void *_pd EINA_UNUSED, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); if (ret) *ret = EINA_FALSE; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); const Eina_List *items; void *(*list_data_get)(const Eina_List *list); @@ -1116,7 +1116,7 @@ _elm_win_smart_focus_direction(Eo *obj, void *_pd EINA_UNUSED, va_list *list) const Eina_List *items; void *(*list_data_get)(const Eina_List *list); - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); /* Focus chain */ if (wd-subobjs) --
[EGIT] [core/elementary] master 05/05: elm_layout: Internal refactoring about layout frozen check.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ea7eab86c34de44171f299d5e6a5a0983346230e
commit ea7eab86c34de44171f299d5e6a5a0983346230e
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:59:58 2013 +0900
elm_layout: Internal refactoring about layout frozen check.
1. Moved frozen variable to more proper position. Elm_Widget_Smart_Data -
Elm_Layout_Smart_Data.
2. Check frozen at one place. This makes codes cleaner and reduces human
mistakes.
---
src/lib/elm_layout.c| 30 --
src/lib/elm_widget.h| 1 -
src/lib/elm_widget_layout.h | 1 +
3 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 31184e2..d863260 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -84,7 +84,6 @@ _on_sub_object_size_hint_change(void *data,
void *event_info __UNUSED__)
{
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
- if (wd-frozen) return;
eo_do(data, elm_obj_layout_sizing_eval());
}
@@ -501,10 +500,8 @@ _elm_layout_smart_sub_object_del(Eo *obj, void *_pd,
va_list *list)
break;
}
- if (wd-frozen) goto end;
eo_do(obj, elm_obj_layout_sizing_eval());
-end:
if (ret) *ret = EINA_TRUE;
}
@@ -1070,8 +1067,6 @@ _elm_layout_smart_content_set(Eo *obj, void *_pd, va_list
*list)
_icon_signal_emit(sd, sub_d, EINA_TRUE);
}
- if (wd-frozen) goto end;
-
eo_do(obj, elm_obj_layout_sizing_eval());
end:
@@ -1230,8 +1225,7 @@ _elm_layout_smart_text_set(Eo *obj, void *_pd, va_list
*list)
_text_signal_emit(sd, sub_d, !!text);
- if (!wd-frozen)
- eo_do(obj, elm_obj_layout_sizing_eval());
+ eo_do(obj, elm_obj_layout_sizing_eval());
if (_elm_config-access_mode == ELM_ACCESS_MODE_ON
wd-can_access !(sub_d-obj))
@@ -1315,10 +1309,8 @@ _elm_layout_smart_box_append(Eo *obj, void *_pd, va_list
*list)
sub_d-obj = child;
sd-subs = eina_list_append(sd-subs, sub_d);
- if (wd-frozen) goto end;
eo_do(obj, elm_obj_layout_sizing_eval());
-end:
if (ret) *ret = EINA_TRUE;
}
@@ -1368,10 +1360,8 @@ _elm_layout_smart_box_prepend(Eo *obj, void *_pd,
va_list *list)
sub_d-obj = child;
sd-subs = eina_list_prepend(sd-subs, sub_d);
- if (wd-frozen) goto end;;
eo_do(obj, elm_obj_layout_sizing_eval());
-end:
if (ret) *ret = EINA_TRUE;
}
@@ -1429,10 +1419,8 @@ _elm_layout_smart_box_insert_before(Eo *obj, void *_pd,
va_list *list)
evas_object_event_callback_add
((Evas_Object *)reference, EVAS_CALLBACK_DEL, _box_reference_del, sub_d);
- if (wd-frozen) goto end;
eo_do(obj, elm_obj_layout_sizing_eval());
-end:
if (ret) *ret = EINA_TRUE;
}
@@ -1486,10 +1474,8 @@ _elm_layout_smart_box_insert_at(Eo *obj, void *_pd,
va_list *list)
sub_d-p.box.pos = pos;
sd-subs = eina_list_append(sd-subs, sub_d);
- if (wd-frozen) goto end;
eo_do(obj, elm_obj_layout_sizing_eval());
-end:
if (ret) *ret = EINA_TRUE;
}
@@ -1643,10 +1629,8 @@ _elm_layout_smart_table_pack(Eo *obj, void *_pd, va_list
*list)
sub_d-p.table.rowspan = rowspan;
sd-subs = eina_list_append(sd-subs, sub_d);
- if (wd-frozen) goto end;
eo_do(obj, elm_obj_layout_sizing_eval());
-end:
if (ret) *ret = EINA_TRUE;
}
@@ -1794,7 +1778,7 @@ static void
_elm_layout_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Layout_Smart_Data *sd = _pd;
-
+ if (sd-frozen) return;
if (sd-needs_size_calc) return;
sd-needs_size_calc = EINA_TRUE;
@@ -1817,10 +1801,11 @@ _elm_layout_smart_freeze(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
int int_ret = 1;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
+ ELM_LAYOUT_DATA_GET(obj, sd);
- if ((wd-frozen)++ != 0)
+ if ((sd-frozen)++ != 0)
{
-int_ret = wd-frozen;
+int_ret = sd-frozen;
goto end;
}
@@ -1846,10 +1831,11 @@ _elm_layout_smart_thaw(Eo *obj, void *_pd EINA_UNUSED,
va_list *list)
int int_ret = 0;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
+ ELM_LAYOUT_DATA_GET(obj, sd);
- if (--(wd-frozen) != 0)
+ if (--(sd-frozen) != 0)
{
-int_ret = wd-frozen;
+int_ret = sd-frozen;
goto end;
}
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 64dc763..0bc8854 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -413,7 +413,6 @@ typedef struct _Elm_Widget_Smart_Data
void(*on_show_region)(void *data,
Evas_Object *obj);
- int frozen;
int orient_mode; /* -1 is disabled */
Eina_Bool drag_x_locked : 1;
diff --git a/src/lib/elm_widget_layout.h b/src/lib/elm_widget_layout.h
index b81def3..514eefd 100644
--- a/src/lib/elm_widget_layout.h
+++
[EGIT] [core/elementary] master 04/05: elm: Use ELM_LAYOUT_DATA_GET convenient macro instead of calling eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS).
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f0bdf8b1e8e90f1268871cbe332d8d65b46d95de
commit f0bdf8b1e8e90f1268871cbe332d8d65b46d95de
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Sat Oct 5 17:29:13 2013 +0900
elm: Use ELM_LAYOUT_DATA_GET convenient macro instead of calling
eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS).
---
src/lib/elm_bubble.c | 2 +-
src/lib/elm_frame.c | 2 +-
src/lib/elm_index.c | 2 +-
src/lib/elm_panes.c | 2 +-
src/lib/elm_progressbar.c | 2 +-
src/lib/elm_scroller.c| 2 +-
src/lib/elm_separator.c | 2 +-
src/lib/elm_slider.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index e78a38d..8d51498 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -269,7 +269,7 @@ _pos_set(Eo *obj, void *_pd, va_list *list)
{
Elm_Bubble_Pos pos = va_arg(*list, Elm_Bubble_Pos);
Elm_Bubble_Smart_Data *sd = _pd;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
if (pos ELM_BUBBLE_POS_TOP_LEFT || pos ELM_BUBBLE_POS_BOTTOM_RIGHT)
return;
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index a72816a..e8cf703 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -158,7 +158,7 @@ static void
_elm_frame_smart_calculate(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Frame_Smart_Data *sd = _pd;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj,
elm_obj_layout_class_get());
+ ELM_LAYOUT_DATA_GET(obj, ld);
if (ld-needs_size_calc)
{
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index b27c5b8..4f11399 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -339,7 +339,7 @@ _elm_index_smart_theme(Eo *obj, void *_pd, va_list *list)
Elm_Index_Smart_Data *sd = _pd;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
_index_box_clear(obj, 0);
_index_box_clear(obj, 1);
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index bbc1d5e..48d8d75 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -51,7 +51,7 @@ _elm_panes_smart_theme(Eo *obj, void *_pd, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
if (sd-horizontal)
eina_stringshare_replace(ld-group, horizontal);
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index 84cdef6..541db17 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -176,7 +176,7 @@ _elm_progressbar_smart_theme(Eo *obj, void *_pd, va_list
*list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-horizontal)
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 52b575e..a9fdf20 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -869,7 +869,7 @@ _custom_widget_base_theme_set(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
{
const char *klass = va_arg(*list, const char *);
const char *group = va_arg(*list, const char *);
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
EINA_SAFETY_ON_NULL_RETURN(klass);
EINA_SAFETY_ON_NULL_RETURN(group);
diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index 3b6e9fc..e4d1e49 100644
--- a/src/lib/elm_separator.c
+++ b/src/lib/elm_separator.c
@@ -21,7 +21,7 @@ _elm_separator_smart_theme(Eo *obj, void *_pd, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
if (sd-horizontal)
eina_stringshare_replace(ld-group, horizontal);
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 162d423..f8ad153 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -471,7 +471,7 @@ _elm_slider_smart_theme(Eo *obj, void *_pd, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd-horizontal)
--
[EGIT] [apps/ecrire] master 01/01: Removing blank and useless entries
maxerba pushed a commit to branch master. http://git.enlightenment.org/apps/ecrire.git/commit/?id=c264be94b084cc04041c7449ff00f2a7723c84f8 commit c264be94b084cc04041c7449ff00f2a7723c84f8 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:05:44 2013 +0200 Removing blank and useless entries --- data/ecrire.desktop | 17 - 1 file changed, 17 deletions(-) diff --git a/data/ecrire.desktop b/data/ecrire.desktop index bdd9c4f..1e0786b 100644 --- a/data/ecrire.desktop +++ b/data/ecrire.desktop @@ -2,24 +2,7 @@ Encoding=UTF-8 Type=Application Name=Ecrire -Name[Name]=Ecrire -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= -Name[eo]= -Name[es]= Name[fr]=Écrire -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=Simple text editor Comment[eo]=Simpla tekst-redaktilo Comment[es]=Un simple editor de texto --
[EGIT] [apps/enjoy] master 01/01: Removing blank and useless entries
maxerba pushed a commit to branch master. http://git.enlightenment.org/apps/enjoy.git/commit/?id=b65d8b5d04aa07f3d609b34ddda9b71ae487b925 commit b65d8b5d04aa07f3d609b34ddda9b71ae487b925 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:08:52 2013 +0200 Removing blank and useless entries --- data/desktop/enjoy.desktop | 16 1 file changed, 16 deletions(-) diff --git a/data/desktop/enjoy.desktop b/data/desktop/enjoy.desktop index 4345729..9c0d667 100644 --- a/data/desktop/enjoy.desktop +++ b/data/desktop/enjoy.desktop @@ -2,24 +2,8 @@ Encoding=UTF-8 Type=Application Name=Enjoy -Name[Name]=Enjoy -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= Name[eo]=Ĝuu -Name[es]= Name[fr]=Enjoy -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=Music Player Comment[eo]=Muzikludilo Comment[es]=Reproductor de música --
[EGIT] [apps/ephoto] master 01/01: Removing blank and useless entries
maxerba pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=1097876fa6a012acf4553adafabca9acc900eca4 commit 1097876fa6a012acf4553adafabca9acc900eca4 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:10:51 2013 +0200 Removing blank and useless entries --- data/desktop/ephoto.desktop | 16 1 file changed, 16 deletions(-) diff --git a/data/desktop/ephoto.desktop b/data/desktop/ephoto.desktop index e6448ea..76c55dc 100644 --- a/data/desktop/ephoto.desktop +++ b/data/desktop/ephoto.desktop @@ -2,24 +2,8 @@ Encoding=UTF-8 Type=Application Name=Ephoto -Name[Name]=Ephoto -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= Name[eo]=EFoto -Name[es]= Name[fr]=EPhoto -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=Enlightened Photo Viewer Comment[eo]=Foto-vidigilo de Enlightenment Comment[es]=Visualizador de fotos de Enlightenment --
[EGIT] [core/efl] master 01/01: Adding italian entries in desktop files
maxerba pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8de703279c5084b283795fcf417103ee911287e5 commit 8de703279c5084b283795fcf417103ee911287e5 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:17:58 2013 +0200 Adding italian entries in desktop files --- src/tests/efreet/data/test.desktop | 2 ++ src/tests/efreet/data/test_type.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/tests/efreet/data/test.desktop b/src/tests/efreet/data/test.desktop index bc21d1d..5403c5e 100644 --- a/src/tests/efreet/data/test.desktop +++ b/src/tests/efreet/data/test.desktop @@ -4,9 +4,11 @@ Type=Application Name=Efreet Test Application Name[eo]=Provoversia aplikaĵo de Efreet Name[fr]=Application test pour Efreet +Name[it]=Applicazione di test per Efreet GenericName=Test Application GenericName[eo]=Provoversia aplikaĵo GenericName[fr]=Application test +GenericName[it]=Applicazione di test Icon=TestIcon Exec=efreet_test %F %i Categories=Test;Enlightenment; diff --git a/src/tests/efreet/data/test_type.desktop b/src/tests/efreet/data/test_type.desktop index ec95108..cbe482f 100644 --- a/src/tests/efreet/data/test_type.desktop +++ b/src/tests/efreet/data/test_type.desktop @@ -4,9 +4,11 @@ Type=My_Type Name=Efreet Test Application Name[eo]=Provoversia aplikaĵo de Efreet Name[fr]=Application test pour Efreet +Name[it]=Applicazione di test per Efreet GenericName=Test Application GenericName[eo]=Provoversia aplikaĵo GenericName[fr]=Application test +GenericName[it]=Applicazione di test Icon=TestIcon Exec=efreet_test %F %i Categories=Test;Enlightenment; --
[EGIT] [core/elementary] master 01/01: Adding italian entry in desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=410a2c1230cdd806ef7d0e93d619b56957e6f798 commit 410a2c1230cdd806ef7d0e93d619b56957e6f798 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:20:15 2013 +0200 Adding italian entry in desktop file --- data/desktop/elementary_test.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/data/desktop/elementary_test.desktop b/data/desktop/elementary_test.desktop index 17dd7e2..c1ffc87 100644 --- a/data/desktop/elementary_test.desktop +++ b/data/desktop/elementary_test.desktop @@ -4,6 +4,7 @@ Type=Application Name=Elementary Test Name[eo]=Provo de Elementary Name[fr]=Test Elementary +Name[it]=Test per Elementary Name[pt]=Testes Elementary Name[ru]=Тест Elementary Comment=Elementary Test Application --
[EGIT] [e16/e16] master 01/01: Fix menu generation some more.
kwo pushed a commit to branch master.
http://git.enlightenment.org/e16/e16.git/commit/?id=1922725db45a179ab8cbf1add1bd9d1cbb70c0a0
commit 1922725db45a179ab8cbf1add1bd9d1cbb70c0a0
Author: Kim Woelders k...@woelders.dk
Date: Sat Oct 5 11:16:27 2013 +0200
Fix menu generation some more.
Stop .desktop file processing when seeing a section other than [Desktop
Entry].
The previous fix in this area didn't do it properly.
Noted by Len E.
---
scripts/e_gen_menu | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/e_gen_menu b/scripts/e_gen_menu
index 94178c3..a552536 100755
--- a/scripts/e_gen_menu
+++ b/scripts/e_gen_menu
@@ -197,8 +197,9 @@ sub ProcessFile {
open(FI,$f) or return;
while (FI) {
s/\s+$//;
- if (/^\[Desktop\s+(\w+)/) {
- last if ($1 ne Entry);
+ if (/^\[(\w+)\s+(\w+)/) {
+ # Note: This breaks if [Desktop Entry] is not the first
+ last if (($1 ne Desktop) or ($2 ne Entry));
} elsif (/^Name=(.*)$/) {
$Name = $1;
} elsif ($loc1 /^Name\[$loc1\]=(.*)$/) {
--
[EGIT] [e16/e16] master 01/01: Remove useless Name[] entries from .desktop files.
kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=34565d50c81ff6a0e9a6fcc9d46d4bc75fa763f9 commit 34565d50c81ff6a0e9a6fcc9d46d4bc75fa763f9 Author: Kim Woelders k...@woelders.dk Date: Sat Oct 5 11:27:46 2013 +0200 Remove useless Name[] entries from .desktop files. --- misc/e16-gnome2-session.desktop.in | 18 -- misc/e16-gnome3-session.desktop| 18 -- misc/e16-kde-session.desktop.in| 18 -- misc/e16-session.desktop.in| 18 -- misc/e16.desktop.in| 18 -- 5 files changed, 90 deletions(-) diff --git a/misc/e16-gnome2-session.desktop.in b/misc/e16-gnome2-session.desktop.in index d76742e..272c5d7 100644 --- a/misc/e16-gnome2-session.desktop.in +++ b/misc/e16-gnome2-session.desktop.in @@ -2,24 +2,6 @@ Encoding=UTF-8 Type=XSession Name=E16 GNOME2 -Name[Name]=E16 GNOME2 -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= -Name[eo]=E16 GNOME2 -Name[es]= -Name[fr]=E16 GNOME2 -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=This session starts GNOME using enlightenment (e16) as window manager Comment[eo]=Tiu sesio lanĉas GNOME uzante Enlightenment (e16) kiel fenestro-administrilon Comment[fr]=Démarre une session GNOME en utilisant enlightenment (e16) comme gestionnaire de fenêtres diff --git a/misc/e16-gnome3-session.desktop b/misc/e16-gnome3-session.desktop index fbec232..20832f8 100644 --- a/misc/e16-gnome3-session.desktop +++ b/misc/e16-gnome3-session.desktop @@ -2,23 +2,5 @@ Encoding=UTF-8 Type=XSession Name=E16 GNOME3 -Name[Name]=E16 GNOME3 -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= -Name[eo]=E16 GNOME3 -Name[es]= -Name[fr]=E16 GNOME3 -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= TryExec=/usr/bin/gnome-session Exec=gnome-session --session=e16-gnome diff --git a/misc/e16-kde-session.desktop.in b/misc/e16-kde-session.desktop.in index 0fb6990..f4330b7 100644 --- a/misc/e16-kde-session.desktop.in +++ b/misc/e16-kde-session.desktop.in @@ -2,24 +2,6 @@ Encoding=UTF-8 Type=XSession Name=E16-KDE -Name[Name]=E16-KDE -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= -Name[eo]=E16-KDE -Name[es]= -Name[fr]=E16-KDE -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=This session starts KDE using enlightenment (e16) as window manager Comment[eo]=Tiu sesio lanĉas KDE uzante Enlightenment (e16) kiel fenestro-administrilo. Comment[fr]=Démarre une session KDE en utilisant enlightenment (e16) comme gestionnaire de fenêtres diff --git a/misc/e16-session.desktop.in b/misc/e16-session.desktop.in index f161624..1feecfc 100644 --- a/misc/e16-session.desktop.in +++ b/misc/e16-session.desktop.in @@ -2,24 +2,6 @@ Encoding=UTF-8 Type=XSession Name=E16 -Name[Name]=E16 -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= -Name[eo]=E16 -Name[es]= -Name[fr]=E16 -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=This session starts the Enlightenment (e16) window manager Comment[eo]=Tiu sesio lanĉas la fenestro-administrilon Enlightenment (e16) Comment[fr]=Démarre une session avec enlightenment (e16) diff --git a/misc/e16.desktop.in b/misc/e16.desktop.in index b87bfeb..3583954 100644 --- a/misc/e16.desktop.in +++ b/misc/e16.desktop.in @@ -2,24 +2,6 @@ Encoding=UTF-8 Type=Application Name=E16 -Name[Name]=E16 -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= -Name[eo]=E16 -Name[es]= -Name[fr]=E16 -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=The Enlightenment (e16) window manager Comment[eo]=Enlightenment (e16) la fenestra agordilo Comment[fr]=Gestionnaire de fenêtres Enlightenment (e16) --
[EGIT] [core/efl] master 01/01: configure - wayland macro required for any kind of autogen.sh... not good.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7b512356b39f26becde195b9d850c880f8643ea6
commit 7b512356b39f26becde195b9d850c880f8643ea6
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Sat Oct 5 18:30:23 2013 +0900
configure - wayland macro required for any kind of autogen.sh... not good.
---
configure.ac | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 21a4d94..f616e0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1007,7 +1007,14 @@ AC_ARG_ENABLE([wayland],
if test ${want_wayland} = yes; then
EFL_PKG_CHECK_STRICT([wayland-client])
- WAYLAND_SCANNER_RULES(['$(top_srcdir)/data/ecore/ecore_wayland/protocol'])
+dnl This is a problem. unless you somehow have this macro defined
+dnl magically... you cant do dev on efl. configure is totally broken.
+dnl you end up with something like:
+dnl
+dnl ./configure: line 25508: syntax error near unexpected token
`'$(top_srcdir)/data/ecore/ecore_wayland/protocol''
+dnl ./configure: line 25508:
`WAYLAND_SCANNER_RULES('$(top_srcdir)/data/ecore/ecore_wayland/protocol')'
+
+dnl
WAYLAND_SCANNER_RULES(['$(top_srcdir)/data/ecore/ecore_wayland/protocol'])
fi
# Fb
--
[EGIT] [core/enlightenment] enlightenment-0.17 01/01: Removing blank entries from desktop files
maxerba pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=dcaf7c09c5d5460e0d569ae36a363771af9f8ae6 commit dcaf7c09c5d5460e0d569ae36a363771af9f8ae6 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:33:08 2013 +0200 Removing blank entries from desktop files --- config/default/profile.desktop | 4 config/mobile/profile.desktop | 10 -- config/standard/profile.desktop| 9 - data/favorites/desktop.desktop | 11 --- data/favorites/home.desktop| 11 --- data/favorites/root.desktop| 14 -- data/favorites/tmp.desktop | 13 - src/modules/wizard/data/desktop/home.desktop | 11 --- src/modules/wizard/data/desktop/root.desktop | 14 -- src/modules/wizard/data/desktop/tmp.desktop| 13 - src/modules/wizard/data/extra_desktops/mplayer.desktop | 15 --- src/modules/wizard/data/extra_desktops/xterm.desktop | 15 --- src/modules/wl_drm/module.desktop | 15 --- src/modules/wl_screenshot/module.desktop | 11 --- src/modules/wl_shell/module.desktop| 15 --- 15 files changed, 181 deletions(-) diff --git a/config/default/profile.desktop b/config/default/profile.desktop index f344455..12c64f5 100644 --- a/config/default/profile.desktop +++ b/config/default/profile.desktop @@ -3,9 +3,7 @@ Encoding=UTF-8 Type=Link Name=Default Name[ab]=默认 -Name[ca]= Name[cs]=Výchozí -Name[de]= Name[el]=Προκαθορισμένο Name[eo]=Aprioro Name[es]=Predefinido @@ -13,11 +11,9 @@ Name[fr]=Prédéfini Name[gl]=Predefinido Name[hu]=Alapértelmezett Name[it]=Predefinito -Name[ja]= Name[ko]=기본 Name[pt]=Predefinições Name[ru]=Заново -Name[sr]= Name[tr]=Öntanımlı Name[zh_CN]=默认 Comment=Select this to begin the initial setup again. diff --git a/config/mobile/profile.desktop b/config/mobile/profile.desktop index ffd832f..32639e2 100644 --- a/config/mobile/profile.desktop +++ b/config/mobile/profile.desktop @@ -2,23 +2,13 @@ Encoding=UTF-8 Type=Link Name=Mobile -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= Name[eo]=Poŝtelefono Name[es]=Móvil Name[fr]=Écran tactile Name[gl]=Móbil -Name[hu]= -Name[it]= -Name[ja]= Name[ko]=터치스크린 Name[pt]=Ecrã tátil Name[ru]=Мобильные устройства -Name[sr]= -Name[tr]= Comment=EXPERIMENTAL!brConfiguration set up to work best with touchscreenbrphones, tablets and similar devices. Comment[eo]=EKSPERIMENTA!brAgordoj kongruas plej kun tuŝekranaj telefonoj,br tabulkomputiloj aŭ similaj aparatoj. Comment[es]=¡EXPERIMENTAL!brConfiguración adaptada para el uso en móvilesbrde pantalla táctil, tablets y dispositivos similares. diff --git a/config/standard/profile.desktop b/config/standard/profile.desktop index 62bf5a1..36fb477 100644 --- a/config/standard/profile.desktop +++ b/config/standard/profile.desktop @@ -2,23 +2,14 @@ Encoding=UTF-8 Type=Link Name=Computer (Standard Enlightenment) -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= Name[eo]=Komputilo (kutima Enlightenment) Name[es]=Ordenador (Enlightenment estándar) Name[fr]=Ordinateur (Enlightenment standard) Name[gl]=Ordenador (Enlightenment estándar) -Name[hu]= Name[it]=Computer (Enlightenment standard) -Name[ja]= Name[ko]=컴퓨터 (표준 Enlightenment) Name[pt]=Computador (Enlightenment padrão) Name[ru]=Компьютер (Стандартный Enlightenment) -Name[sr]= -Name[tr]= Comment=Configuration for devices with keyboards and micebrlike your average PC Desktop, Laptop or Netbookbrwith Enlightenment's traditional keyboard bindingsbrand mouse controls. Comment[eo]=Agordoj por aparatoj kun klavaro kaj musobrsamkiel via kutima PC aŭ portebla komputilobrkun kutima klavaraj bindaĵoj de Enlightenment kaj musaj kontroloj. Comment[es]=Configuración para dispositivos con teclado ybrratón, como puede ser un PC de escritorio, portátil o Netbook,brcon las asociaciones de teclado y ratónbrtradicionales de Enlightenment. diff --git a/data/favorites/desktop.desktop b/data/favorites/desktop.desktop index 7111410..c98975e 100644 --- a/data/favorites/desktop.desktop +++ b/data/favorites/desktop.desktop @@ -2,23 +2,12 @@ Encoding=UTF-8 Type=Link Name=Desktop -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= Name[eo]=Labortablo Name[es]=Escritorio Name[fr]=Bureau Name[gl]=Escritorio -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=Área de trabalho Name[ru]=Рабочий стол -Name[sr]= -Name[tr]= Comment=Files on your Desktop Comment[eo]=Dosieroj sur via labortablo Comment[es]=Los archivos en su escritorio diff --git a/data/favorites/home.desktop b/data/favorites/home.desktop index b4558f8..5307fee 100644 --- a/data/favorites/home.desktop +++
[EGIT] [core/elementary] elementary-1.7 01/01: Removing blank entries from desktop files
maxerba pushed a commit to branch elementary-1.7. http://git.enlightenment.org/core/elementary.git/commit/?id=7d2042e9082ba84d4d1d5bde11917bb915e3bf18 commit 7d2042e9082ba84d4d1d5bde11917bb915e3bf18 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:36:14 2013 +0200 Removing blank entries from desktop files --- config/default/profile.desktop | 4 config/mobile/profile.desktop | 10 -- config/standard/profile.desktop | 6 -- 3 files changed, 20 deletions(-) diff --git a/config/default/profile.desktop b/config/default/profile.desktop index f8fccad..00373fc 100644 --- a/config/default/profile.desktop +++ b/config/default/profile.desktop @@ -3,9 +3,7 @@ Encoding=UTF-8 Type=Link Name=Default Name[ab]=默认 -Name[ca]= Name[cs]=Výchozí -Name[de]= Name[el]=Προκαθορισμένο Name[eo]=Aprioro Name[es]=Predefinido @@ -13,11 +11,9 @@ Name[fr]=Prédéfini Name[gl]=Predefinido Name[hu]=Alapértelmezett Name[it]=Predefinito -Name[ja]= Name[ko]=기본 Name[pt]=Predefinições Name[ru]=Заново -Name[sr]= Name[tr]=Öntanımlı Name[zh_CN]=默认 Comment=Select this to beginbrthe initial setup again. diff --git a/config/mobile/profile.desktop b/config/mobile/profile.desktop index 8573846..7f24498 100644 --- a/config/mobile/profile.desktop +++ b/config/mobile/profile.desktop @@ -2,23 +2,13 @@ Encoding=UTF-8 Type=Link Name=Mobile -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= Name[eo]=Poŝtelefono Name[es]=Móvil Name[fr]=Écran tactile Name[gl]=Móbil -Name[hu]= -Name[it]= -Name[ja]= Name[ko]=터치스크린 Name[pt]=Ecrã tátil Name[ru]=Мобильные устройства -Name[sr]= -Name[tr]= Comment=Configuration set up to work best with touchscreenbrphones, tablets and similar devices. Comment[eo]=Agordoj kongruas plej kun tuŝekranaj telefonoj,br tabulkomputiloj aŭ similaj aparatoj. Comment[fr]=Configuration adaptée aux écrans tactilesbrdes téléphones, tablettes et apparentés. diff --git a/config/standard/profile.desktop b/config/standard/profile.desktop index e2f8809..6f0cf88 100644 --- a/config/standard/profile.desktop +++ b/config/standard/profile.desktop @@ -3,22 +3,16 @@ Encoding=UTF-8 Type=Link Name=Standard Name[ab]=标准 -Name[ca]= Name[cs]=Standartní -Name[de]= Name[el]=Κανονικό Name[eo]=Kutima Name[es]=Estándar Name[fr]=Standard Name[gl]=Estándar Name[hu]=Általános -Name[it]= -Name[ja]= Name[ko]=표준 Name[pt]=Padrão Name[ru]=Стандартный -Name[sr]= -Name[tr]= Name[zh_CN]=标准 Comment=This is the standardbrprofile that isbruniversal for mostbrdesktop and laptopbrsystems. Choose thisbrif you are notbrsure what to choose. Comment[cs]=Toto je standartníbruniverzálníbrprofil pro většinubrstolních a přenosnýchbrpočítačů. Vyberte pokudbrsi nejste jistibrco vybrat. --
Re: [E-devel] Git, merges, and better work-flows
On Sat, 5 Oct 2013 17:58:17 +0900 Daniel Juyung Seo seojuyu...@gmail.com wrote: On Fri, Oct 4, 2013 at 11:48 PM, Tom Hacohen tom.haco...@samsung.comwrote: On 04/10/13 15:40, Michael Blumenkrantz wrote: On Fri, 04 Oct 2013 15:18:46 +0100 Tom Hacohen tom.haco...@samsung.com wrote: On 02/10/13 16:17, Tom Hacohen wrote: Hey guys, I would like to suggest a new work-flow. This work-flow will not be mandatory, but just an allowed alternative to the current commit to master approach. At the moment we do not allow merges, at all. This was to prevent people from littering the log with their inability to rebase (git pull --rebase) their local changes on top of the existing commits. This will still remain the same. I'd like to suggest using merges to our advantage. I suggest the following: For fixes, small features, and the like, do the same as you do now. Commit and push to master. For bigger features, rewrites, or any form of a few commits that are tied together by being part of the same set, do as follows (it's obviously simpler than that, I listed everything to over-simplify things): 1. Create a branch (either local or remote) for your change. 2. Work on that branch. 3. When ready, instead of pushing to master: 3. rebase over master (git fetch; git rebase origin/master). 4. switch to master (git checkout master) 6. git merge --no-ff your-feature-branch-name 7. Describe your feature in the commit message. 8. push to master (git push or git push origin master). I've done a few example commits on https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/ This work-flow lets us have linear history, while having feature-sets show as a single merge that can easily be reverted, provide a good description about a feature and the commits that introduced it and I find generally easier for the eye. There are also technical advantages, for example, if you run git log --first-parent you will only see the merge commits, cleaning the log from all the fluff involving a feature letting you just see the feature. Another advantage is that git bisect will not go inside the merged branch unless the issue was introduced there. Please feel free to inspect my repo, more specifically, the log: https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/log/ To see how it looks. Important note: commits on the merge branch should be treated as if they are on master, that is, don't use this as an excuse to make ugly commits with bad commit messages. Again: I'm not trying to make it mandatory, just to allow this sort of merges. Please let me know what you think. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel So, is this a go? May I write up some documentation about it and start doing it? -- Tom. I think you probably could have started documenting it at any point to help those who are interested. I already documented enough to explain the idea, and a more detailed explanation is available at the link Peter gave. I will only format it and actually put it in our documentation if actually agreed upon. Would be a waste of time otherwise. Well, your explanation in your first email was quite enough for me. I just made a merge branch commit what you described above. https://git.enlightenment.org/core/elementary.git/commit/?id=ad8a00cf343786497f12ef6efc1c1de38d363196 It was quite easy and clear to me. Thanks for the suggestion. I thought the object of this exercise was to squash them down to a single commit? So why was there dozens of commit emails? -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. signature.asc Description: PGP signature -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk___
[EGIT] [games/e_cho] master 01/01: Removing blank and useless entries from desktop files
maxerba pushed a commit to branch master. http://git.enlightenment.org/games/e_cho.git/commit/?id=b668315d11c62e64613b4eff2501aade05c98977 commit b668315d11c62e64613b4eff2501aade05c98977 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:50:13 2013 +0200 Removing blank and useless entries from desktop files --- data/desktop/e_cho.desktop | 16 1 file changed, 16 deletions(-) diff --git a/data/desktop/e_cho.desktop b/data/desktop/e_cho.desktop index 8cf0674..12d6a0f 100644 --- a/data/desktop/e_cho.desktop +++ b/data/desktop/e_cho.desktop @@ -2,24 +2,8 @@ Encoding=UTF-8 Type=Application Name=Echo -Name[Name]=Echo -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= Name[eo]=Eĥo -Name[es]= Name[fr]=Écho -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=Game Comment[eo]=Ludo Comment[es]=Juego --
[EGIT] [games/elemines] master 01/01: Removing blank and useless entries from desktop files
maxerba pushed a commit to branch master. http://git.enlightenment.org/games/elemines.git/commit/?id=cf1f1f6afc95bdb90c36dd973956a6c707c90eec commit cf1f1f6afc95bdb90c36dd973956a6c707c90eec Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:51:59 2013 +0200 Removing blank and useless entries from desktop files --- data/desktop/elemines.desktop | 17 - 1 file changed, 17 deletions(-) diff --git a/data/desktop/elemines.desktop b/data/desktop/elemines.desktop index 8e09057..9a03871 100644 --- a/data/desktop/elemines.desktop +++ b/data/desktop/elemines.desktop @@ -3,24 +3,7 @@ Encoding=UTF-8 Type=Application Version=1.0 Name=elemines -Name[Name]=elemines -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= -Name[eo]= -Name[es]= Name[fr]=Elemines -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= GenericName=mine sweeper GenericName[fr]=démineur GenericName[it]=Campo minato --
[EGIT] [enlightenment/modules/alarm] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/alarm.git/commit/?id=a481a07d9d5b2cd03928a37d874023da1c30d1c0 commit a481a07d9d5b2cd03928a37d874023da1c30d1c0 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:53:19 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 8 1 file changed, 8 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index ae20fa1..98db747 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -3,10 +3,7 @@ Encoding=UTF-8 Type=Link Version=1.0 Name=Alarm -Name[Name]=Alarm Name[ab]=Alarm 提示 -Name[ca]= -Name[cs]= Name[de]=Alarm Name[el]=Αφύπνιση Name[eo]=Alarmo @@ -14,13 +11,8 @@ Name[es]=Alarma Name[fr]=Alarme Name[gl]=Alarma Name[hu]=Emlékeztető -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=Alarme Name[ru]=Будильник -Name[sr]= -Name[tr]= Name[zh_CN]=Alarm 提示 Comment=A module which allows you to set popup reminders. Comment[cs]=Modul umožňující nastavit upomínky. --
[EGIT] [enlightenment/modules/cpu] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/cpu.git/commit/?id=8874e7bcabab3c3076cf6d88de219ff08721 commit 8874e7bcabab3c3076cf6d88de219ff08721 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:54:35 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 10 -- 1 file changed, 10 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index 79f6c4b..84115e6 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,24 +2,14 @@ Encoding=UTF-8 Type=Link Name=Cpu -Name[Name]=Cpu Name[ab]=CPU 工具 -Name[ca]= -Name[cs]= Name[de]=Prozessor Name[el]=Επεξεργαστής Name[eo]=Ĉefprocesoro -Name[es]= Name[fr]=Cpu -Name[gl]= Name[hu]=Processzor -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=Processador Name[ru]=Процессор -Name[sr]= -Name[tr]= Name[zh_CN]=CPU 工具 Comment=Used to monitor CPU utilization. Comment[cs]=Použitý k měření vytížení CPU. --
[EGIT] [enlightenment/modules/engage] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/engage.git/commit/?id=edaddf339a36055b09d4c6ad25cec747b70dd6bb commit edaddf339a36055b09d4c6ad25cec747b70dd6bb Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:56:30 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 16 1 file changed, 16 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index b9d1b72..086ed5c 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,24 +2,8 @@ Encoding=UTF-8 Type=Link Name=Engage -Name[Name]=Engage -Name[ab]= -Name[ca]= -Name[cs]= Name[de]=Engage -Name[el]= Name[eo]=Engage -Name[es]= -Name[fr]= -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=A dock that holds a taskbar and application launcherbrAdd instances with: Config Panel Extensions Engage Comment[de]=Ein Dock mit einer Taskbar und AnwendungsstarternbrInstanzen können hinzugefügt werden über: Enlightenment-Einstellungen → Erweiterungen → Itask-NG Comment[eo]=Doko kiu entenas taskopleton kaj lanĉilon de aplikaĵoj.brAldonu instancojn per: Panelo de agordoj Etendaĵoj Engage --
[EGIT] [enlightenment/modules/eweather] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/eweather.git/commit/?id=8ab0a2e3b5e421bbbf8533ef24bafad84f667c52 commit 8ab0a2e3b5e421bbbf8533ef24bafad84f667c52 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:57:56 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 11 --- 1 file changed, 11 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index b5514e6..780c8e3 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,24 +2,13 @@ Encoding=UTF-8 Type=Link Name=EWeather -Name[Name]=EWeather -Name[ab]= -Name[ca]= Name[cs]=Počasí -Name[de]= Name[el]=Καιρός Name[eo]=EVetero -Name[es]= Name[fr]=E-météo -Name[gl]= Name[hu]=Időjárás -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=E-Meteorologia Name[ru]=Е-Погода -Name[sr]= -Name[tr]= Comment=A weather gadget. Comment[cs]=Zobrazí aktuální počasí. Comment[de]=Aktuelles Wetter betrachten --
[EGIT] [enlightenment/modules/forecasts] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=ab49329e22495be6a7fd4c941dc516e493355fc2 commit ab49329e22495be6a7fd4c941dc516e493355fc2 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:58:43 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 9 - 1 file changed, 9 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index 2b2b36c..5438f81 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,24 +2,15 @@ Encoding=UTF-8 Type=Link Name=Forecasts -Name[Name]=Forecasts -Name[ab]= -Name[ca]= Name[cs]=Předpověď počasí -Name[de]= Name[el]=Προβλέψεις Name[eo]=Veterprognozoj Name[es]=Predicciones metereológicas Name[fr]=Prévisions Name[gl]=Predicións metereolóxicas Name[hu]=Elõrejelzés -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=Previsões meteorológicas Name[ru]=Прогноз погоды -Name[sr]= -Name[tr]= Comment=The forecasts gadget will display the current weather conditions plus a few days forecast. Comment[cs]=Zobrazuje aktuální počasí plus předpověď na několik dní. Comment[el]=Το συστατικό προβλέψεων θα εμφανίσει τις τρέχουσες καιρικές συνθήκες και των επόμενων ημερών. --
[EGIT] [enlightenment/modules/mail] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/mail.git/commit/?id=68a748d798beeb02634042ccee037c595161516d commit 68a748d798beeb02634042ccee037c595161516d Author: maxerba maiur...@gmail.com Date: Sat Oct 5 11:59:42 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 10 -- 1 file changed, 10 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index f060c1b..6f5cdbc 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,24 +2,14 @@ Encoding=UTF-8 Type=Link Name=Mail -Name[Name]=Mail -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= Name[el]=Αλληλογραφία Name[eo]=Retpoŝto Name[es]=Correo electrónico Name[fr]=Courriel Name[gl]=Correo electrónico Name[hu]=E-mail modul -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=Correio eletrónico Name[ru]=Почта -Name[sr]= -Name[tr]= Comment=Mail notification gadget. Checks POP3, IMAP, maildir, and mbox mailboxes. Comment[cs]=Gadget pro upozornění na e-mail. Kontroluje POP3, IMAP, maildir, a mbox schránky. Comment[el]=Συστατικό ειδοποίησης μηνυμάτων. Ελέγχει γραμματοκιβώτια τύπου POP3, IMAP, maildir, και mbox. --
[EGIT] [enlightenment/modules/moon] master 01/01: Fixing desktop files
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/moon.git/commit/?id=a29bd0ecc1ef0922d73b408532a6f30d652a5be7 commit a29bd0ecc1ef0922d73b408532a6f30d652a5be7 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 12:01:15 2013 +0200 Fixing desktop files --- module.desktop.in | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index 45f8841..fb1d0cf 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,24 +2,15 @@ Encoding=UTF-8 Type=Link Name=Moon -Name[Name]=Moon -Name[ab]= -Name[ca]= Name[cs]=Měsíc -Name[de]= Name[el]=Σελήνη Name[eo]=Luno Name[es]=Luna Name[fr]=Lune Name[gl]=Lúa Name[hu]=Hold -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= +Name[pt]=Lua Name[ru]=Луна -Name[sr]= -Name[tr]= GenericName=gadget GenericName[eo]=akcesoraĵo Comment=Gadget for e17 which displays the current phase of the moon. @@ -34,5 +25,4 @@ Comment[it]=Modulo per e17 che mostra l'attuale fase lunare. Comment[pt]=Módulo que exibe a fase lunar Comment[ru]=Гаджет для Е17, которыей показывает текущую фазу луны. Icon=e-module-moon -Nome[pt]=Lua X-Enlightenment-ModuleType=utils --
[EGIT] [enlightenment/modules/net] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/net.git/commit/?id=c2174c63655959e83e418e3baf17690c7a41cc5d commit c2174c63655959e83e418e3baf17690c7a41cc5d Author: maxerba maiur...@gmail.com Date: Sat Oct 5 12:03:21 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 12 1 file changed, 12 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index af49f2f..64a85bc 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,24 +2,12 @@ Encoding=UTF-8 Type=Link Name=Net -Name[Name]=Net -Name[ab]= -Name[ca]= Name[cs]=Síť -Name[de]= Name[el]=Δίκτυο Name[eo]=Reto -Name[es]= Name[fr]=Réseau -Name[gl]= Name[hu]=Hálózat -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= Name[ru]=Сеть -Name[sr]= -Name[tr]= Comment=Network interface monitor. Comment[cs]=Monitoruje síťové připojení. Comment[el]=Παρακολούθηση του δικτύου. --
[EGIT] [enlightenment/modules/mpdule] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/mpdule.git/commit/?id=6064d87230965fc12b25a1fbecbdae73c43f0a73 commit 6064d87230965fc12b25a1fbecbdae73c43f0a73 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 12:02:36 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 16 1 file changed, 16 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index c3ac265..1a57798 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,24 +2,8 @@ Encoding=UTF-8 Type=Link Name=MPDule -Name[Name]=MPDule -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= Name[eo]=MPDule -Name[es]= Name[fr]=MPDule -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=View what's playing in MPD. Comment[cs]=Zobrazí, co hraje v MPD. Comment[el]=Εμφάνιση του τι παίζει στο MPD. --
[EGIT] [enlightenment/modules/news] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/news.git/commit/?id=bdfbe615bb64d562e15f54ecc79f4a015e131fb1 commit bdfbe615bb64d562e15f54ecc79f4a015e131fb1 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 12:04:07 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 9 - 1 file changed, 9 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index 7a74377..72d3479 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,24 +2,15 @@ Encoding=UTF-8 Type=Link Name=News -Name[Name]=News -Name[ab]= -Name[ca]= Name[cs]=Novinky -Name[de]= Name[el]=Νέα Name[eo]=Aktualaĵoj Name[es]=Noticias Name[fr]=Actualités Name[gl]=Novas Name[hu]=Hírek -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=Notícias Name[ru]=Новости -Name[sr]= -Name[tr]= Comment=Gadget to monitor RSS feeds. Comment[cs]=Gadget k monitorování RSS. Comment[el]=Συστατικό για την παρακολούθηση Ροών RSS. --
[EGIT] [enlightenment/modules/penguins] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/penguins.git/commit/?id=519fe3bbfce92af32035fd3f0cd3c3c3b264d8b5 commit 519fe3bbfce92af32035fd3f0cd3c3c3b264d8b5 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 12:04:49 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 8 1 file changed, 8 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index db6da7d..e09a325 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,9 +2,6 @@ Encoding=UTF-8 Type=Link Name=Penguins -Name[Name]=Penguins -Name[ab]= -Name[ca]= Name[cs]=Tučňáci Name[de]=Pinguine Name[el]=Πιγκουίνοι @@ -13,13 +10,8 @@ Name[es]=Pingüinos Name[fr]=Pingouins Name[gl]=Pingüíns Name[hu]=Pingvinek -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=Pinguins Name[ru]=Пингвины -Name[sr]= -Name[tr]= Comment=Module to display fancy penguins walking around your desktop. Comment[cs]=Zobrazí tučňáky chodící pod desktopu(jako xpenguins). Comment[de]=Lustige Pinguine laufen auf Ihrem Desktop umher. --
[EGIT] [enlightenment/modules/photo] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/photo.git/commit/?id=5bf4490959829aeff333b799fa972f2f53b86ba0 commit 5bf4490959829aeff333b799fa972f2f53b86ba0 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 12:05:40 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 9 - 1 file changed, 9 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index 715b58d..c0a575a 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,10 +2,6 @@ Encoding=UTF-8 Type=Link Name=Photo -Name[Name]=Photo -Name[ab]= -Name[ca]= -Name[cs]= Name[de]=Foto Name[el]=Φωτογραφίες Name[eo]=Foto @@ -13,13 +9,8 @@ Name[es]=Foto Name[fr]=Photo Name[gl]=Foto Name[hu]=Fénykép -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=Foto Name[ru]=Фото -Name[sr]= -Name[tr]= Comment=View photos or a mini slideshow within this gadget. Comment[cs]=Zobrazí fotky nebo malou slideshow uvnitř gadgetu. Comment[de]=Fotos oder eine kleine Diaschau innerhalb eines Helfers betrachten. --
Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert evas/textblock - null check.
If the function could return the NULL, then NULL check could be simply enough description I think Otherwise, I agree those commits are totally wrong and may need more descrive messages. I didn't oppose you yet. But the function(_evas_textblock_node_visible_at_pos_get) code has the case to return NULL explicitly still, So I asked you why do you leave the function to return NULL case if you don't agree on it. You didn't answer at all but only focused on the commit message that could be depeneded on the function do. -Regards, Hermet- -Original Message- From: Tom Hacohentom.haco...@samsung.com To: enlightenment-devel@lists.sourceforge.net; Cc: Sent: 2013-10-04 (금) 22:54:39 Subject: Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert evas/textblock - null check. On 04/10/13 14:47, Carsten Haitzler (The Rasterman) wrote: On Fri, 4 Oct 2013 21:09:29 +0900 (KST) ChunEon Park hermet@naver.com said: it shouldn't be in. maybe. but you made the function to return NULL. and then you want to know reason by other people? what tom is fishing for is.. you check for a null return and safely exit from the code... but tom thinks it should never be null. he wants to know what/in what setup it returns null. :) he wants it *IN* the commit message. i recently in the past week queried tom on an old commit of his that had a log message that was useless - i was trying to find out WHY he did something and the log didnt say it. :) Exactly! Well the log did say it, but unfortunately in a language only I understand. :) I managed to decrypt that message, but this message from Hermet I wasn't able to. I am a sinner, just like the rest of us. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [enlightenment/modules/places] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/places.git/commit/?id=d26c9090d154a437a72563c720de09ed288fe0c6 commit d26c9090d154a437a72563c720de09ed288fe0c6 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 12:06:21 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 8 1 file changed, 8 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index c001ad9..a27da80 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,9 +2,6 @@ Encoding=UTF-8 Type=Link Name=Places -Name[Name]=Places -Name[ab]= -Name[ca]= Name[cs]=Místa Name[de]=Orte Name[el]=Τοποθεσίες @@ -13,13 +10,8 @@ Name[es]=Sitios Name[fr]=Raccourcis Name[gl]=Lugares Name[hu]=Helyek -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=Locais Name[ru]=Места -Name[sr]= -Name[tr]= Comment=This module manage the volumes device attached to the system. Comment[cs]=Tento modul spravuje disky/USB/CD/DVD připojené k systému. Comment[de]=Verwalten der am System angeschlossenen Datenträger. --
[EGIT] [core/elementary] master 01/01: write down the breaks.
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=45e66737b9efe689b5b7b7d47d5612e3549e4d04 commit 45e66737b9efe689b5b7b7d47d5612e3549e4d04 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Sat Oct 5 19:06:05 2013 +0900 write down the breaks. --- ChangeLog | 9 + NEWS | 2 ++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8a070fc..a9ab155 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1666,8 +1666,17 @@ It makes fileselector navigate folder using double tap instead of single tap. 2013-10-02 Ryuan Choi (ryuan) + * fileselector: Add activated smart callback. It can be used to execute a file activated by double-clicking or pressing Enter key. 2013-10-03 ChunEon Park (Hermet) + * Focus: update the focus highlight style when theme is changed. + +2013-10-04 Carsten Haitzler (The Rasterman) + +* Break popup theme - it was poorly namespaced, unable to +handle styles at all (so styles were broken with the given +namespace). + diff --git a/NEWS b/NEWS index 6355743..e40f674 100644 --- a/NEWS +++ b/NEWS @@ -294,6 +294,8 @@ Fixes: * Fix fileselector only send selected signal without selection when file path is typed on the path entry. * Fix spinner arrow key focus movement bug. * Fix the layout to swallow the contents again when theme is changed. + * elm_player breaks theme due to poor namespacing + * elm_popup breaks theme due to poor namespacing Removals: --
[EGIT] [enlightenment/modules/tclock] master 01/01: Removing blank and useless entries from desktop file
maxerba pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/tclock.git/commit/?id=618b72d2d4e92a0fd4efdff5bd51e8d77a80 commit 618b72d2d4e92a0fd4efdff5bd51e8d77a80 Author: maxerba maiur...@gmail.com Date: Sat Oct 5 12:07:05 2013 +0200 Removing blank and useless entries from desktop file --- module.desktop.in | 14 -- 1 file changed, 14 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index 492b849..4c234d2 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,24 +2,10 @@ Encoding=UTF-8 Type=Link Name=TClock -Name[Name]=TClock -Name[ab]= -Name[ca]= -Name[cs]= Name[de]=TClock Name[el]=Ρολόι TClock Name[eo]=THorloĝo -Name[es]= Name[fr]=HorlogeT -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=A digital clock gadget. Comment[cs]=Gadget poskytující digitální hodiny. Comment[de]=Digitale Uhranzeige. --
Re: [E-devel] Git, merges, and better work-flows
No. The point is not to squash them, but have one cover-letter commit that holds them all. If you git log --first-parent you won't see all the commits, just the merge commit that describes the whole changeset. On Sat, Oct 5, 2013 at 10:36 AM, David Seikel onef...@gmail.com wrote: On Sat, 5 Oct 2013 17:58:17 +0900 Daniel Juyung Seo seojuyu...@gmail.com wrote: On Fri, Oct 4, 2013 at 11:48 PM, Tom Hacohen tom.haco...@samsung.comwrote: On 04/10/13 15:40, Michael Blumenkrantz wrote: On Fri, 04 Oct 2013 15:18:46 +0100 Tom Hacohen tom.haco...@samsung.com wrote: On 02/10/13 16:17, Tom Hacohen wrote: Hey guys, I would like to suggest a new work-flow. This work-flow will not be mandatory, but just an allowed alternative to the current commit to master approach. At the moment we do not allow merges, at all. This was to prevent people from littering the log with their inability to rebase (git pull --rebase) their local changes on top of the existing commits. This will still remain the same. I'd like to suggest using merges to our advantage. I suggest the following: For fixes, small features, and the like, do the same as you do now. Commit and push to master. For bigger features, rewrites, or any form of a few commits that are tied together by being part of the same set, do as follows (it's obviously simpler than that, I listed everything to over-simplify things): 1. Create a branch (either local or remote) for your change. 2. Work on that branch. 3. When ready, instead of pushing to master: 3. rebase over master (git fetch; git rebase origin/master). 4. switch to master (git checkout master) 6. git merge --no-ff your-feature-branch-name 7. Describe your feature in the commit message. 8. push to master (git push or git push origin master). I've done a few example commits on https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/ This work-flow lets us have linear history, while having feature-sets show as a single merge that can easily be reverted, provide a good description about a feature and the commits that introduced it and I find generally easier for the eye. There are also technical advantages, for example, if you run git log --first-parent you will only see the merge commits, cleaning the log from all the fluff involving a feature letting you just see the feature. Another advantage is that git bisect will not go inside the merged branch unless the issue was introduced there. Please feel free to inspect my repo, more specifically, the log: https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/log/ To see how it looks. Important note: commits on the merge branch should be treated as if they are on master, that is, don't use this as an excuse to make ugly commits with bad commit messages. Again: I'm not trying to make it mandatory, just to allow this sort of merges. Please let me know what you think. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel So, is this a go? May I write up some documentation about it and start doing it? -- Tom. I think you probably could have started documenting it at any point to help those who are interested. I already documented enough to explain the idea, and a more detailed explanation is available at the link Peter gave. I will only format it and actually put it in our documentation if actually agreed upon. Would be a waste of time otherwise. Well, your explanation in your first email was quite enough for me. I just made a merge branch commit what you described above. https://git.enlightenment.org/core/elementary.git/commit/?id=ad8a00cf343786497f12ef6efc1c1de38d363196 It was quite easy and clear to me. Thanks for the suggestion. I thought the object of this exercise was to squash them down to a single commit? So why was there dozens of commit emails? -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. -- October
Re: [E-devel] Git, merges, and better work-flows
Exactly. Awesome. :) On Sat, Oct 5, 2013 at 9:58 AM, Daniel Juyung Seo seojuyu...@gmail.comwrote: On Fri, Oct 4, 2013 at 11:48 PM, Tom Hacohen tom.haco...@samsung.com wrote: On 04/10/13 15:40, Michael Blumenkrantz wrote: On Fri, 04 Oct 2013 15:18:46 +0100 Tom Hacohen tom.haco...@samsung.com wrote: On 02/10/13 16:17, Tom Hacohen wrote: Hey guys, I would like to suggest a new work-flow. This work-flow will not be mandatory, but just an allowed alternative to the current commit to master approach. At the moment we do not allow merges, at all. This was to prevent people from littering the log with their inability to rebase (git pull --rebase) their local changes on top of the existing commits. This will still remain the same. I'd like to suggest using merges to our advantage. I suggest the following: For fixes, small features, and the like, do the same as you do now. Commit and push to master. For bigger features, rewrites, or any form of a few commits that are tied together by being part of the same set, do as follows (it's obviously simpler than that, I listed everything to over-simplify things): 1. Create a branch (either local or remote) for your change. 2. Work on that branch. 3. When ready, instead of pushing to master: 3. rebase over master (git fetch; git rebase origin/master). 4. switch to master (git checkout master) 6. git merge --no-ff your-feature-branch-name 7. Describe your feature in the commit message. 8. push to master (git push or git push origin master). I've done a few example commits on https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/ This work-flow lets us have linear history, while having feature-sets show as a single merge that can easily be reverted, provide a good description about a feature and the commits that introduced it and I find generally easier for the eye. There are also technical advantages, for example, if you run git log --first-parent you will only see the merge commits, cleaning the log from all the fluff involving a feature letting you just see the feature. Another advantage is that git bisect will not go inside the merged branch unless the issue was introduced there. Please feel free to inspect my repo, more specifically, the log: https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/log/ To see how it looks. Important note: commits on the merge branch should be treated as if they are on master, that is, don't use this as an excuse to make ugly commits with bad commit messages. Again: I'm not trying to make it mandatory, just to allow this sort of merges. Please let me know what you think. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel So, is this a go? May I write up some documentation about it and start doing it? -- Tom. I think you probably could have started documenting it at any point to help those who are interested. I already documented enough to explain the idea, and a more detailed explanation is available at the link Peter gave. I will only format it and actually put it in our documentation if actually agreed upon. Would be a waste of time otherwise. Well, your explanation in your first email was quite enough for me. I just made a merge branch commit what you described above. https://git.enlightenment.org/core/elementary.git/commit/?id=ad8a00cf343786497f12ef6efc1c1de38d363196 It was quite easy and clear to me. Thanks for the suggestion. Daniel Juyung Seo (SeoZ) -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [Enlightenment-release] Releases pending
Eduardo Lima (Etrunko) schrieb: Fresh new Enlightenment and Elementary. Also, not so new Ecore which was not sent to the ML. The black screen with old config still exists. md5sum 860e38f358cda23f40509f25a819d335 ecore-1.7.9.tar.bz2 8f9f8f74b8b899dd80d26fdb7008d89d ecore-1.7.9.tar.gz 589ade7ae89dc236976bfa0c25fcb84f elementary-1.7.9.tar.bz2 39fcd51f67b54cc1ebf7fcef4e2539ae elementary-1.7.9.tar.gz fe30d720080c3a7dd03ffc76a71d27af enlightenment-0.17.5.tar.bz2 195029366047e65150fb77c53bb35f63 enlightenment-0.17.5.tar.gz sha256sum f94b0d7146bdda8cc50ab8fa90b95b5039cd7a2ee349160517e484877364b1d1 ecore-1.7.9.tar.bz2 c754014f60edfa972dc2dd8318d3226239b1f53e7a77c3ef8660c70c576bd0a5 ecore-1.7.9.tar.gz 81a485fa6ed210df21eed9e6323efdcf85df12253bcee6f6e11593ae56efb0bc elementary-1.7.9.tar.bz2 7c47a794521b263f90ea80e3d8b330b90d9db3f8b696e470bd6965994d41b58d elementary-1.7.9.tar.gz 2eacc173090f256d14677c11ba81e1b58f5396ae9a42850c7232079152b35407 enlightenment-0.17.5.tar.bz2 7250d4f3f9b52e730d07f14521b131fd272f5a20cd3811ca76ace9f4c3233e39 enlightenment-0.17.5.tar.gz 2013/9/23 Eduardo Lima (Etrunko) ebl...@gmail.com: I have just uploaded new Evas tarballs which include latest texblock fixes from Tom. ae00f5eda9d9d2c7fc287b12babfc87b evas-1.7.9.tar.bz2 38f5add4539d8494807b17bfa6930977 evas-1.7.9.tar.gz 83b23239b46fa0c349a48dc6146927136578fa413530d084f5d1c269e6d4c63c evas-1.7.9.tar.bz2 e12f92acd344d5854f0b215cbc8740f1feef7e822ef87bfa8419fe012a25b164 evas-1.7.9.tar.gz Regards, Eduardo. 2013/9/18 Eduardo Lima (Etrunko) ebl...@gmail.com: 2013/9/18 Thomas Sachau to...@gentoo.org: Carsten Haitzler (The Rasterman) schrieb: On Fri, 13 Sep 2013 14:57:33 -0300 Eduardo Lima (Etrunko) ebl...@gmail.com said: It is already Friday the 13th, and I have not yet heard any feedbacks. Can we get this official release out of the doors by Tuesday? no. give it a few weeks. last release left people with systems that couldnt even stat e and had a blank screen. let's not do that again. Current status: fixed: -opengl+gles support with =mesa-9.1 (Gentoo Bug 462732) -e hanging prior to splash screen (Gentoo Bug 483194) -black screen on startup with multiscreen setup (might be the a duplicate of the previous one) (Gentoo Bug 484996) Still open: -black screen, when starting with an older config from before 0.17.4, while startup is fine with a new, clean config (Gentoo Bug 485268) Thanks for the report. :) I have updated the elementary tarballs with a couple of commits that went in today. md5sum 59b495e9a5f1736bb0e69d4f9e4acfc5 elementary-1.7.9.tar.bz2 ef8074cc3feca6fc5978984accffbbb2 elementary-1.7.9.tar.gz sha256sum fe5d673d7687e31862d6728de362fdb9bca5c5a660c2aa6c47e663ad92ae6dbd elementary-1.7.9.tar.bz2 89846ee721a23d9dd01cf18eff186ce5680cafe8fbe760a6869dd909c296c4d1 elementary-1.7.9.tar.gz Regards, Eduardo -- Eduardo de Barros Lima ◤✠◢ ebl...@gmail.com -- Eduardo de Barros Lima ◤✠◢ ebl...@gmail.com -- Thomas Sachau Gentoo Linux Developer signature.asc Description: OpenPGP digital signature -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 01/01: Removing blank entries from desktop files
maxerba pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0b463d2d1ab1d56edab5437b61a13607cb270f2e commit 0b463d2d1ab1d56edab5437b61a13607cb270f2e Author: maxerba maiur...@gmail.com Date: Sat Oct 5 14:32:17 2013 +0200 Removing blank entries from desktop files --- src/modules/illume-bluetooth/module.desktop.in | 1 - src/modules/illume-home-toggle/module.desktop.in | 1 - src/modules/illume-home/module.desktop.in| 1 - src/modules/illume-indicator/module.desktop.in | 1 - src/modules/illume-kbd-toggle/module.desktop.in | 1 - src/modules/illume-keyboard/module.desktop.in| 1 - src/modules/illume-mode-toggle/module.desktop.in | 1 - src/modules/illume-softkey/module.desktop.in | 1 - src/modules/illume2/module.desktop.in| 1 - 9 files changed, 9 deletions(-) diff --git a/src/modules/illume-bluetooth/module.desktop.in b/src/modules/illume-bluetooth/module.desktop.in index 85412d0..0e18717 100644 --- a/src/modules/illume-bluetooth/module.desktop.in +++ b/src/modules/illume-bluetooth/module.desktop.in @@ -5,6 +5,5 @@ Name=Illume-Bluetooth Name[eo]=Bludento Illume Name[fr]=Bluetooth Illume Name[sr]=Блутут одсјај -Comment= Icon=e-module-illume-bluetooth X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-home-toggle/module.desktop.in b/src/modules/illume-home-toggle/module.desktop.in index 00d4ea6..739052b 100644 --- a/src/modules/illume-home-toggle/module.desktop.in +++ b/src/modules/illume-home-toggle/module.desktop.in @@ -4,6 +4,5 @@ Type=Link Name=Illume-Home-Toggle Name[eo]=Baskulilo de hejmo Illume Name[sr]=Прекидач личног одсјаја -Comment= Icon=e-module-illume-home-toggle X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-home/module.desktop.in b/src/modules/illume-home/module.desktop.in index 212b366..2f8635b 100644 --- a/src/modules/illume-home/module.desktop.in +++ b/src/modules/illume-home/module.desktop.in @@ -5,6 +5,5 @@ Name=Illume-Home Name[eo]=Illume-Hejmo Name[fr]=Accueil Illume Name[sr]=Лични одсјај -Comment= Icon=e-module-illume-home X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-indicator/module.desktop.in b/src/modules/illume-indicator/module.desktop.in index 4fcb0cc..09a5f4b 100644 --- a/src/modules/illume-indicator/module.desktop.in +++ b/src/modules/illume-indicator/module.desktop.in @@ -5,6 +5,5 @@ Name=Illume-Indicator Name[eo]=Illume-Indikilo Name[fr]=Indicateur Illume Name[sr]=Указивач одсјаја -Comment= Icon=e-module-illume-indicator X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-kbd-toggle/module.desktop.in b/src/modules/illume-kbd-toggle/module.desktop.in index 11f2d58..030f4d3 100644 --- a/src/modules/illume-kbd-toggle/module.desktop.in +++ b/src/modules/illume-kbd-toggle/module.desktop.in @@ -5,6 +5,5 @@ Name=Illume-Keyboard-Toggle Name[eo]=Baskulo de klavaro Illume Name[fr]=Bascule clavier Illume Name[sr]=Прекидач тастатуре одјсаја -Comment= Icon=e-module-illume-kbd-toggle X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-keyboard/module.desktop.in b/src/modules/illume-keyboard/module.desktop.in index 747ab86..73f41ec 100644 --- a/src/modules/illume-keyboard/module.desktop.in +++ b/src/modules/illume-keyboard/module.desktop.in @@ -5,6 +5,5 @@ Name=Illume-Keyboard Name[eo]=Illume-Klavaro Name[fr]=Clavier Illume Name[sr]=Тастатура одсјаја -Comment= Icon=e-module-illume-keyboard X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-mode-toggle/module.desktop.in b/src/modules/illume-mode-toggle/module.desktop.in index d0c967a..10a8e1d 100644 --- a/src/modules/illume-mode-toggle/module.desktop.in +++ b/src/modules/illume-mode-toggle/module.desktop.in @@ -4,6 +4,5 @@ Type=Link Name=Illume-Mode-Toggle Name[eo]=Baskulilo de reĝimo Illume Name[sr]=Прекидач одсјаја -Comment= Icon=e-module-illume-mode-toggle X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-softkey/module.desktop.in b/src/modules/illume-softkey/module.desktop.in index b8413c1..6ec4680 100644 --- a/src/modules/illume-softkey/module.desktop.in +++ b/src/modules/illume-softkey/module.desktop.in @@ -2,6 +2,5 @@ Encoding=UTF-8 Type=Link Name=Illume-Softkey -Comment= Icon=e-module-illume-softkey X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume2/module.desktop.in b/src/modules/illume2/module.desktop.in index 4176a74..3063f2d 100644 --- a/src/modules/illume2/module.desktop.in +++ b/src/modules/illume2/module.desktop.in @@ -2,6 +2,5 @@ Encoding=UTF-8 Type=Link Name=Illume2 -Comment= Icon=e-module-illume2 X-Enlightenment-ModuleType=mobile --
[EGIT] [themes/dark] master 02/02: enable naviframe include.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=22e901780d93d7b60e02edc2e5cf710f848ea226
commit 22e901780d93d7b60e02edc2e5cf710f848ea226
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Sat Oct 5 21:32:29 2013 +0900
enable naviframe include.
---
edje/dark.edc | 2 +-
edje/edc/elm/actionslider.edc | 6 +++---
edje/edc/elm/button.edc | 24 ++---
edje/edc/elm/calendar.edc | 8 +++
edje/edc/elm/check.edc| 4 ++--
edje/edc/elm/clock.edc| 16 +++---
edje/edc/elm/ctxpopup.edc | 4 ++--
edje/edc/elm/dayselector.edc | 44 +-
edje/edc/elm/diskselector.edc | 49 +++
edje/edc/elm/flipselector.edc | 35 ---
edje/edc/elm/focus.edc| 4 ++--
edje/edc/elm/genlist.edc | 8 +++
edje/edc/elm/hover.edc| 12 +--
edje/edc/elm/layout.edc | 6 +++---
edje/edc/elm/menu.edc | 16 +++---
edje/edc/elm/panel.edc| 2 +-
edje/edc/elm/radio.edc| 2 +-
edje/edc/elm/slider.edc | 32 ++--
edje/edc/elm/slideshow.edc| 32 ++--
edje/edc/elm/spinner.edc | 12 +--
20 files changed, 140 insertions(+), 178 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 59e0d3a..89c5d90 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -59,7 +59,7 @@ collections {
// XXX: support multi progress (progressbar)
#include edc/elm/progress.edc
// XXX: needs design work (naviframe)
-//#include edc/elm/naviframe.edc
+#include edc/elm/naviframe.edc
#include edc/elm/panel.edc
#include edc/elm/popup.edc
#include edc/elm/border.edc
diff --git a/edje/edc/elm/actionslider.edc b/edje/edc/elm/actionslider.edc
index e444e20..eb4f4bc 100644
--- a/edje/edc/elm/actionslider.edc
+++ b/edje/edc/elm/actionslider.edc
@@ -207,7 +207,7 @@ group { name: elm/actionslider/base/default;
programs {
program {
signal: mouse,up,1; source: elm.drag_button;
- action: SIGNAL_EMIT elm.drag_button,mouse,up ;
+ action: SIGNAL_EMIT elm.drag_button,mouse,up elm;
after: button_unclick_anim;
}
program { name: button_unclick_anim;
@@ -217,7 +217,7 @@ group { name: elm/actionslider/base/default;
}
program {
signal: mouse,down,1*; source: elm.drag_button;
- action: SIGNAL_EMIT elm.drag_button,mouse,down ;
+ action: SIGNAL_EMIT elm.drag_button,mouse,down elm;
after: button_click_anim;
}
program { name: button_click_anim;
@@ -227,7 +227,7 @@ group { name: elm/actionslider/base/default;
}
program {
signal: mouse,move; source: elm.drag_button_base;
- action: SIGNAL_EMIT elm.drag_button,mouse,move ;
+ action: SIGNAL_EMIT elm.drag_button,mouse,move elm;
}
program {
signal: elm,state,disabled; source: elm;
diff --git a/edje/edc/elm/button.edc b/edje/edc/elm/button.edc
index cae568f..49dff06 100644
--- a/edje/edc/elm/button.edc
+++ b/edje/edc/elm/button.edc
@@ -203,7 +203,7 @@ group { name: elm/button/base/default;
programs {
program {
signal: mouse,down,1; source: event;
- action: SIGNAL_EMIT elm,action,press ;
+ action: SIGNAL_EMIT elm,action,press elm;
after: button_click_anim;
}
program { name: button_click_anim;
@@ -212,7 +212,7 @@ group { name: elm/button/base/default;
}
program { name: button_unclick;
signal: mouse,up,1; source: event;
- action: SIGNAL_EMIT elm,action,unpress ;
+ action: SIGNAL_EMIT elm,action,unpress elm;
after: button_unclick_anim;
}
program { name: button_unclick_anim;
@@ -232,7 +232,7 @@ group { name: elm/button/base/default;
}
program {
signal: mouse,clicked,1; source: event;
- action: SIGNAL_EMIT elm,action,click ;
+ action: SIGNAL_EMIT elm,action,click elm;
}
program { name: button_text_visible;
signal: elm,state,text,visible; source: elm;
@@ -547,7 +547,7 @@ group { name: elm/button/base/anchor;
programs {
program {
signal: mouse,down,1; source: event;
- action: SIGNAL_EMIT elm,action,press ;
+ action: SIGNAL_EMIT elm,action,press elm;
after: button_click_anim;
}
program { name: button_click_anim;
@@ -558,7 +558,7 @@ group { name: elm/button/base/anchor;
}
program {
signal: mouse,up,1; source: event;
- action: SIGNAL_EMIT elm,action,unpress ;
+ action: SIGNAL_EMIT elm,action,unpress elm;
after: button_unclick_anim;
}
program { name: button_unclick_anim;
@@ -584,7 +584,7 @@ group { name: elm/button/base/anchor;
}
program {
signal: mouse,clicked,1;
[EGIT] [themes/dark] master 01/02: add naviframe .. start on it. not finished.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=483bb395dfa2de3978e3e3b59aadcd115da45c06
commit 483bb395dfa2de3978e3e3b59aadcd115da45c06
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Sat Oct 5 21:32:02 2013 +0900
add naviframe .. start on it. not finished.
---
edje/edc/elm/naviframe.edc | 1033
1 file changed, 1033 insertions(+)
diff --git a/edje/edc/elm/naviframe.edc b/edje/edc/elm/naviframe.edc
new file mode 100644
index 000..7ee276f
--- /dev/null
+++ b/edje/edc/elm/naviframe.edc
@@ -0,0 +1,1033 @@
+#if 0
+group { name: elm/naviframe/item/basic/default;
+ parts {
+ part { name: elm.swallow.content; type: SWALLOW;
+ description { state: default 0.0;
+ }
+ }
+ part { name: access.title; type: RECT; repeat_events: 1;
+ description { state: default 0.0;
+fixed: 1 1;
+color: 0 0 0 0;
+ }
+ }
+ part { name: elm.swallow.prev_btn; type: SWALLOW;
+ description { state: default 0.0;
+ }
+ description { state: hidden 0.0;
+inherit: default 0.0;
+visible: 0;
+ }
+ }
+ part { name: elm.swallow.next_btn; type: SWALLOW;
+ description { state: default 0.0;
+ }
+ description { state: hidden 0.0;
+inherit: default 0.0;
+visible: 0;
+ }
+ }
+ part { name: elm.swallow.icon; type: SWALLOW;
+ description { state: default 0.0;
+ }
+ }
+ part { name: elm.text.title; type: TEXT;
+ scale: 1;
+ description { state: default 0.0;
+ }
+ }
+ part { name: elm.text.subtitle; type: TEXT;
+ scale: 1;
+ description { state: default 0.0;
+ }
+ }
+ }
+ programs {
+ program {
+ signal: elm,state,visible; source: elm;
+ }
+ program {
+ signal: elm,state,title,show; source: elm;
+ }
+ program {
+ signal: elm,state,title,hide; source: elm;
+ }
+ program {
+ signal: elm,state,title_label,show; source: elm;
+ }
+ program {
+ signal: elm,state,title_label,hide; source: elm;
+ }
+ program {
+ signal: elm,state,prev_btn,show; source: elm;
+ }
+ program {
+ signal: elm,state,prev_btn,hide; source: elm;
+ }
+ program {
+ signal: elm,state,next_btn,show; source: elm;
+ }
+ program {
+ signal: elm,state,next_btn,hide; source: elm;
+ }
+
+// action: SIGNAL_EMIT elm,action,title,clicked elm;
+
+ /* current page is being pushed: [previous][current] */
+ program {
+ signal: elm,state,cur,pushed; source: elm;
+ after: pushed2;
+ }
+ program { name: pushed2;
+ action: SIGNAL_EMIT elm,action,pushed,finished elm;
+ }
+
+ /* current page is being popped: [current][next] */
+ program {
+ signal: elm,state,cur,popped; source: elm;
+ after: popped2;
+ }
+ program { name: popped2;
+ action: SIGNAL_EMIT elm,action,popped,finished elm;
+ }
+
+ /* new page is being pushed: [current][next] */
+ program {
+ signal: elm,state,new,pushed; source: elm;
+ after: pushed3;
+ }
+ program { name: pushed3;
+ action: SIGNAL_EMIT elm,action,show,finished elm;
+ }
+
+ /* previous page is being pushed: [previous][current] */
+ program {
+ signal: elm,state,prev,popped; source: elm;
+ after: popped3;
+ }
+ program { name: popped3;
+ action: SIGNAL_EMIT elm,action,show,finished elm;
+ }
+ }
+}
+
+group { name: elm/naviframe/item/overlap/default;
+ alias: elm/naviframe/item/overlap/pager;
+}
+#endif
+
+#if 0
+group { name: elm/naviframe/item/basic/default;
+ alias: elm/naviframe/item/basic/pager; /** this was remained for the
backward compatibility */
+
+ images {
+ image: naviframe-base.jpg COMP;
+ }
+
+ script {
+ public notitle = 0;
+ public noprev = 0;
+ public nonext = 0;
+
+ public set_notitle(val) {
+ if (get_int(notitle) == val) return;
+
+ set_int(notitle, val);
+ if (val)
+set_state(PART:elm.swallow.icon, no-title, 0.0);
+ else
+set_state(PART:elm.swallow.icon, default, 0.0);
+ }
+
+ public apply_area() {
+ new np = get_int(noprev);
+ new nn = get_int(nonext);
+
+ if ((!np) (!nn))
+set_state(PART:elements_area, default, 0.0);
+ else if ((np) (nn))
+set_state(PART:elements_area, full, 0.0);
+ else if (np)
+set_state(PART:elements_area, no-prev, 0.0);
+ else if (nn)
+set_state(PART:elements_area, no-next, 0.0);
+ }
+
+ public set_noprev(val) {
+ if
[EGIT] [core/elementary] master 01/01: fix up namespace for many signal while keeping old versions for compat
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f9adb79740555c8e39e9d32ff2a755693dbea8dc commit f9adb79740555c8e39e9d32ff2a755693dbea8dc Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Sat Oct 5 21:35:27 2013 +0900 fix up namespace for many signal while keeping old versions for compat --- src/lib/elc_ctxpopup.c | 4 ++-- src/lib/elc_naviframe.c| 8 src/lib/elm_actionslider.c | 6 +++--- src/lib/elm_button.c | 6 +++--- src/lib/elm_check.c| 6 +++--- src/lib/elm_clock.c| 16 src/lib/elm_dayselector.c | 19 ++- src/lib/elm_diskselector.c | 2 +- src/lib/elm_genlist.c | 27 --- src/lib/elm_hover.c| 5 +++-- src/lib/elm_menu.c | 10 +- src/lib/elm_radio.c| 2 +- src/lib/elm_slider.c | 16 +++- src/lib/elm_slideshow.c| 31 ++- src/lib/elm_thumb.c| 6 +++--- src/lib/elm_win.c | 4 ++-- 16 files changed, 101 insertions(+), 67 deletions(-) diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c index e4a675b..32ad8a4 100644 --- a/src/lib/elc_ctxpopup.c +++ b/src/lib/elc_ctxpopup.c @@ -1137,13 +1137,13 @@ _elm_ctxpopup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) CRITICAL(Failed to set layout!); elm_layout_signal_callback_add - (obj, elm,action,hide,finished, , _hide_finished_cb, obj); + (obj, elm,action,hide,finished, *, _hide_finished_cb, obj); //Background priv-bg = edje_object_add(evas_object_evas_get(obj)); elm_widget_theme_object_set(obj, priv-bg, ctxpopup, bg, default); edje_object_signal_callback_add - (priv-bg, elm,action,click, , _bg_clicked_cb, obj); + (priv-bg, elm,action,click, *, _bg_clicked_cb, obj); evas_object_stack_below(priv-bg, obj); diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index e6509f4..4f35439 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -1183,13 +1183,13 @@ _item_new(Evas_Object *obj, _on_item_size_hints_changed, obj); elm_object_signal_callback_add - (VIEW(it), elm,action,show,finished, , _on_item_show_finished, it); + (VIEW(it), elm,action,show,finished, *, _on_item_show_finished, it); elm_object_signal_callback_add - (VIEW(it), elm,action,pushed,finished, , _on_item_push_finished, it); + (VIEW(it), elm,action,pushed,finished, *, _on_item_push_finished, it); elm_object_signal_callback_add - (VIEW(it), elm,action,popped,finished, , _on_item_pop_finished, it); + (VIEW(it), elm,action,popped,finished, *, _on_item_pop_finished, it); elm_object_signal_callback_add - (VIEW(it), elm,action,title,clicked, , _on_item_title_clicked, it); + (VIEW(it), elm,action,title,clicked, *, _on_item_title_clicked, it); _item_style_set(it, item_style); diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c index c2eb002..4459764 100644 --- a/src/lib/elm_actionslider.c +++ b/src/lib/elm_actionslider.c @@ -407,13 +407,13 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_object_color_set(priv-drag_button_base, 0, 0, 0, 0); edje_object_signal_callback_add - (wd-resize_obj, elm.drag_button,mouse,up, , + (wd-resize_obj, elm.drag_button,mouse,up, *, _drag_button_up_cb, obj); edje_object_signal_callback_add - (wd-resize_obj, elm.drag_button,mouse,down, , + (wd-resize_obj, elm.drag_button,mouse,down, *, _drag_button_down_cb, obj); edje_object_signal_callback_add - (wd-resize_obj, elm.drag_button,mouse,move, , + (wd-resize_obj, elm.drag_button,mouse,move, *, _drag_button_move_cb, obj); if (!elm_layout_theme_set diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index 758d253..ddbe165 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -292,13 +292,13 @@ _elm_button_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) elm_widget_sub_object_parent_add(obj); edje_object_signal_callback_add - (wd-resize_obj, elm,action,click, , + (wd-resize_obj, elm,action,click, *, _on_clicked_signal, obj); edje_object_signal_callback_add - (wd-resize_obj, elm,action,press, , + (wd-resize_obj, elm,action,press, *, _on_pressed_signal, obj); edje_object_signal_callback_add - (wd-resize_obj, elm,action,unpress, , + (wd-resize_obj, elm,action,unpress, *, _on_unpressed_signal, obj); _elm_access_object_register(obj, wd-resize_obj); diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c index 0098ac4..696ad2e 100644 --- a/src/lib/elm_check.c +++ b/src/lib/elm_check.c @@ -294,13 +294,13 @@ _elm_check_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) elm_widget_sub_object_parent_add(obj); edje_object_signal_callback_add - (wd-resize_obj,
Re: [E-devel] Git, merges, and better work-flows
I thought the same as David Seikel :) That's why the commit tsunami happened. Anyhow, it's same as before except we now allow merge commit for some cases. Daniel Juyung Seo (SeoZ) On Sat, Oct 5, 2013 at 8:09 PM, Tom Hacohen t...@stosb.com wrote: No. The point is not to squash them, but have one cover-letter commit that holds them all. If you git log --first-parent you won't see all the commits, just the merge commit that describes the whole changeset. On Sat, Oct 5, 2013 at 10:36 AM, David Seikel onef...@gmail.com wrote: On Sat, 5 Oct 2013 17:58:17 +0900 Daniel Juyung Seo seojuyu...@gmail.com wrote: On Fri, Oct 4, 2013 at 11:48 PM, Tom Hacohen tom.haco...@samsung.comwrote: On 04/10/13 15:40, Michael Blumenkrantz wrote: On Fri, 04 Oct 2013 15:18:46 +0100 Tom Hacohen tom.haco...@samsung.com wrote: On 02/10/13 16:17, Tom Hacohen wrote: Hey guys, I would like to suggest a new work-flow. This work-flow will not be mandatory, but just an allowed alternative to the current commit to master approach. At the moment we do not allow merges, at all. This was to prevent people from littering the log with their inability to rebase (git pull --rebase) their local changes on top of the existing commits. This will still remain the same. I'd like to suggest using merges to our advantage. I suggest the following: For fixes, small features, and the like, do the same as you do now. Commit and push to master. For bigger features, rewrites, or any form of a few commits that are tied together by being part of the same set, do as follows (it's obviously simpler than that, I listed everything to over-simplify things): 1. Create a branch (either local or remote) for your change. 2. Work on that branch. 3. When ready, instead of pushing to master: 3. rebase over master (git fetch; git rebase origin/master). 4. switch to master (git checkout master) 6. git merge --no-ff your-feature-branch-name 7. Describe your feature in the commit message. 8. push to master (git push or git push origin master). I've done a few example commits on https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/ This work-flow lets us have linear history, while having feature-sets show as a single merge that can easily be reverted, provide a good description about a feature and the commits that introduced it and I find generally easier for the eye. There are also technical advantages, for example, if you run git log --first-parent you will only see the merge commits, cleaning the log from all the fluff involving a feature letting you just see the feature. Another advantage is that git bisect will not go inside the merged branch unless the issue was introduced there. Please feel free to inspect my repo, more specifically, the log: https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/log/ To see how it looks. Important note: commits on the merge branch should be treated as if they are on master, that is, don't use this as an excuse to make ugly commits with bad commit messages. Again: I'm not trying to make it mandatory, just to allow this sort of merges. Please let me know what you think. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel So, is this a go? May I write up some documentation about it and start doing it? -- Tom. I think you probably could have started documenting it at any point to help those who are interested. I already documented enough to explain the idea, and a more detailed explanation is available at the link Peter gave. I will only format it and actually put it in our documentation if actually agreed upon. Would be a waste of time otherwise. Well, your explanation in your first email was quite enough for me. I just made a merge branch commit what you described above. https://git.enlightenment.org/core/elementary.git/commit/?id=ad8a00cf343786497f12ef6efc1c1de38d363196 It was quite easy and
[EGIT] [core/efl] master 02/03: Revert ecore/wayland: Add and initialize subcompositor inside Ecore_Wayland.
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f66eceed10bc7101eda31594a06af82777be53da
commit f66eceed10bc7101eda31594a06af82777be53da
Author: discomfitor michael.blumenkra...@gmail.com
Date: Sat Oct 5 16:23:38 2013 +0100
Revert ecore/wayland: Add and initialize subcompositor inside
Ecore_Wayland.
This reverts commit 7994b62c6be0368a2b4dcd038de5f25556cb6842.
---
src/lib/ecore_wayland/Ecore_Wayland.h | 1 -
src/lib/ecore_wayland/ecore_wl.c | 7 ---
2 files changed, 8 deletions(-)
diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h
b/src/lib/ecore_wayland/Ecore_Wayland.h
index 30545b7..6f50ba1 100644
--- a/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
@@ -102,7 +102,6 @@ struct _Ecore_Wl_Display
struct wl_display *display;
struct wl_registry *registry;
struct wl_compositor *compositor;
-struct wl_subcompositor *subcompositor;
struct wl_shell *shell;
struct wl_shell *desktop_shell;
struct wl_shm *shm;
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index ee614e0..d2565b8 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -398,8 +398,6 @@ _ecore_wl_shutdown(Eina_Bool close)
wl_data_device_manager_destroy(_ecore_wl_disp-wl.data_device_manager);
if (_ecore_wl_disp-wl.compositor)
wl_compositor_destroy(_ecore_wl_disp-wl.compositor);
-if (_ecore_wl_disp-wl.subcompositor)
- wl_subcompositor_destroy(_ecore_wl_disp-wl.subcompositor);
if (_ecore_wl_disp-wl.display)
{
wl_registry_destroy(_ecore_wl_disp-wl.registry);
@@ -518,11 +516,6 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry
*registry, unsigned in
ewd-wl.compositor =
wl_registry_bind(registry, id, wl_compositor_interface, 3);
}
- else if (!strcmp(interface, wl_subcompositor))
- {
-ewd-wl.subcompositor =
- wl_registry_bind(registry, id, wl_subcompositor_interface, 1);
- }
else if (!strcmp(interface, wl_output))
_ecore_wl_output_add(ewd, id);
else if (!strcmp(interface, wl_seat))
--
[EGIT] [core/efl] master 01/03: Revert adding wayland subsurfaces protocol file.
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=06a5ba211899c7aec148c6f459bfb33d632d9444
commit 06a5ba211899c7aec148c6f459bfb33d632d9444
Author: discomfitor michael.blumenkra...@gmail.com
Date: Sat Oct 5 16:22:15 2013 +0100
Revert adding wayland subsurfaces protocol file.
This reverts commit ad27efcb397f3dc8da670180784991f876841e01.
---
configure.ac | 8 -
data/ecore/ecore_wayland/protocol/subsurface.xml | 244 ---
src/Makefile_Ecore_Wayland.am| 17 --
src/lib/ecore_wayland/.gitignore | 2 -
4 files changed, 271 deletions(-)
diff --git a/configure.ac b/configure.ac
index f616e0d..77972b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1007,14 +1007,6 @@ AC_ARG_ENABLE([wayland],
if test ${want_wayland} = yes; then
EFL_PKG_CHECK_STRICT([wayland-client])
-dnl This is a problem. unless you somehow have this macro defined
-dnl magically... you cant do dev on efl. configure is totally broken.
-dnl you end up with something like:
-dnl
-dnl ./configure: line 25508: syntax error near unexpected token
`'$(top_srcdir)/data/ecore/ecore_wayland/protocol''
-dnl ./configure: line 25508:
`WAYLAND_SCANNER_RULES('$(top_srcdir)/data/ecore/ecore_wayland/protocol')'
-
-dnl
WAYLAND_SCANNER_RULES(['$(top_srcdir)/data/ecore/ecore_wayland/protocol'])
fi
# Fb
diff --git a/data/ecore/ecore_wayland/protocol/subsurface.xml
b/data/ecore/ecore_wayland/protocol/subsurface.xml
deleted file mode 100644
index 9e4a658..000
--- a/data/ecore/ecore_wayland/protocol/subsurface.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-protocol name=subsurface
-
- copyright
-Copyright © 2012-2013 Collabora, Ltd.
-
-Permission to use, copy, modify, distribute, and sell this
-software and its documentation for any purpose is hereby granted
-without fee, provided that the above copyright notice appear in
-all copies and that both that copyright notice and this permission
-notice appear in supporting documentation, and that the name of
-the copyright holders not be used in advertising or publicity
-pertaining to distribution of the software without specific,
-written prior permission. The copyright holders make no
-representations about the suitability of this software for any
-purpose. It is provided as is without express or implied
-warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
- /copyright
-
- interface name=wl_subcompositor version=1
-description summary=sub-surface compositing
- The global interface exposing sub-surface compositing capabilities.
- A wl_surface, that has sub-surfaces associated, is called the
- parent surface. Sub-surfaces can be arbitrarily nested and create
- a tree of sub-surfaces.
-
- The root surface in a tree of sub-surfaces is the main
- surface. The main surface cannot be a sub-surface, because
- sub-surfaces must always have a parent.
-
- A main surface with its sub-surfaces forms a (compound) window.
- For window management purposes, this set of wl_surface objects is
- to be considered as a single window, and it should also behave as
- such.
-
- The aim of sub-surfaces is to offload some of the compositing work
- within a window from clients to the compositor. A prime example is
- a video player with decorations and video in separate wl_surface
- objects. This should allow the compositor to pass YUV video buffer
- processing to dedicated overlay hardware when possible.
-/description
-
-request name=destroy type=destructor
- description summary=unbind from the subcompositor interface
- Informs the server that the client will not be using this
- protocol object anymore. This does not affect any other
- objects, wl_subsurface objects included.
- /description
-/request
-
-enum name=error
- entry name=bad_surface value=0
- summary=the to-be sub-surface is invalid/
-/enum
-
-request name=get_subsurface
- description summary=give a surface the role sub-surface
- Create a sub-surface interface for the given surface, and
- associate it with the given parent surface. This turns a
- plain wl_surface into a sub-surface.
-
- The to-be sub-surface must not already have a dedicated
- purpose, like any shell surface type, cursor image, drag
[EGIT] [core/efl] master 03/03: Revert ecore/wayland: Add subsurface handling APIs.
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8f493ab6c5975b5346bbd6ee502e9888e4255b8a commit 8f493ab6c5975b5346bbd6ee502e9888e4255b8a Author: discomfitor michael.blumenkra...@gmail.com Date: Sat Oct 5 16:26:24 2013 +0100 Revert ecore/wayland: Add subsurface handling APIs. This reverts commit 65b960f4a60442edcd66082ccc1828b80a49885c. Conflicts: src/lib/ecore_wayland/ecore_wl.c --- src/Makefile_Ecore_Wayland.am| 1 - src/lib/ecore_wayland/Ecore_Wayland.h| 92 +-- src/lib/ecore_wayland/ecore_wl.c | 1 - src/lib/ecore_wayland/ecore_wl_private.h | 2 - src/lib/ecore_wayland/ecore_wl_subsurf.c | 191 --- src/lib/ecore_wayland/ecore_wl_window.c | 2 - 6 files changed, 1 insertion(+), 288 deletions(-) diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am index 41d2a6f..aaf08f5 100644 --- a/src/Makefile_Ecore_Wayland.am +++ b/src/Makefile_Ecore_Wayland.am @@ -14,7 +14,6 @@ lib/ecore_wayland/ecore_wl_dnd.c \ lib/ecore_wayland/ecore_wl_input.c \ lib/ecore_wayland/ecore_wl_output.c \ lib/ecore_wayland/ecore_wl_window.c \ -lib/ecore_wayland/ecore_wl_subsurf.c \ lib/ecore_wayland/ecore_wl_private.h lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WAYLAND_CFLAGS@ diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h index 6f50ba1..3588341 100644 --- a/src/lib/ecore_wayland/Ecore_Wayland.h +++ b/src/lib/ecore_wayland/Ecore_Wayland.h @@ -12,6 +12,7 @@ # include wayland-client.h # include wayland-cursor.h # include xkbcommon/xkbcommon.h +# include subsurface-client-protocol.h # ifdef EAPI # undef EAPI @@ -35,7 +36,6 @@ typedef struct _Ecore_Wl_Display Ecore_Wl_Display; typedef struct _Ecore_Wl_Output Ecore_Wl_Output; typedef struct _Ecore_Wl_Input Ecore_Wl_Input; typedef struct _Ecore_Wl_Global Ecore_Wl_Global; /** @since 1.7.6 */ -typedef struct _Ecore_Wl_Subsurf Ecore_Wl_Subsurf; /** @since 1.8 */ # ifndef _ECORE_WAYLAND_WINDOW_PREDEF typedef struct _Ecore_Wl_Window Ecore_Wl_Window; @@ -252,8 +252,6 @@ struct _Ecore_Wl_Window /* FIXME: Ideally we should record the cursor name for this window * so we can compare and avoid unnecessary cursor set calls to wayland */ - Ecore_Wl_Subsurf *subsurfs; - void *data; }; @@ -384,7 +382,6 @@ struct _Ecore_Wl_Event_Interfaces_Bound * @li @ref Ecore_Wl_Window_Group * @li @ref Ecore_Wl_Input_Group * @li @ref Ecore_Wl_Dnd_Group - * @li @ref Ecore_Wl_Subsurf */ EAPI extern int ECORE_WL_EVENT_MOUSE_IN; @@ -868,93 +865,6 @@ EAPI struct wl_array *ecore_wl_dnd_drag_types_get(Ecore_Wl_Input *input); EAPI void ecore_wl_server_mode_set(Eina_Bool on); -/** - * @defgroup Ecore_Wl_Subsurf Functions to manipulate subsurfaces. - * @ingroup Ecore_Wl_Group - * - * Functions to manipulate wayland subsurfaces, using Ecore_Wl_Subsurf. - * - * This API is intended to expose Wayland subsurface functionality, although it - * should not be necessary for most applications to use it, as soon as we have - * means to make Evas automatically switch Evas images to use subsurfaces. - * - * It can/should be used, for instance, when subsurfaces are needed to be not - * in sync with the main window surface. - */ - -/** - * Create and return a new subsurface. - * - * Create a new surface (and subsurface interface), with the parent surface - * being the one associated with the given @param win. - * - * The @param win must be visible, otherwise there will be no surface created - * for it yet. - * - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI Ecore_Wl_Subsurf *ecore_wl_subsurf_create(Ecore_Wl_Window *win); - -/** - * Destroy the given subsurface, as well as the surface associated with it. - * - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void ecore_wl_subsurf_del(Ecore_Wl_Subsurf *ess); - -/** - * Return the wl_surface associated with this subsurface. - * - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI struct wl_surface *ecore_wl_subsurf_surface_get(Ecore_Wl_Subsurf *ess); - -/** - * Set the position of this subsurface, relative to its parent surface. - * - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void ecore_wl_subsurf_position_set(Ecore_Wl_Subsurf *ess, int x, int y); - -/** - * Get the position of this subsurface, relative to its parent surface. - * - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void ecore_wl_subsurf_position_get(Ecore_Wl_Subsurf *ess, int *x, int *y); - -/** - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void ecore_wl_subsurf_place_above(Ecore_Wl_Subsurf *ess, struct wl_surface *surface); - -/** - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void ecore_wl_subsurf_place_below(Ecore_Wl_Subsurf *ess, struct wl_surface *surface); - -/** - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void
Re: [E-devel] [EGIT] [core/efl] master 03/03: Revert ecore/wayland: Add subsurface handling APIs.
these 3 commits 100% break wayland building on any system, in addition to having broken non-wayland building. test your builds much more thoroughly before committing again. On Sat, 05 Oct 2013 08:29:04 -0700 discomfitor michael.blumenkra...@gmail.com wrote: discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8f493ab6c5975b5346bbd6ee502e9888e4255b8a commit 8f493ab6c5975b5346bbd6ee502e9888e4255b8a Author: discomfitor michael.blumenkra...@gmail.com Date: Sat Oct 5 16:26:24 2013 +0100 Revert ecore/wayland: Add subsurface handling APIs. This reverts commit 65b960f4a60442edcd66082ccc1828b80a49885c. Conflicts: src/lib/ecore_wayland/ecore_wl.c ignore this, I was lazy and didn't edit the message. --- src/Makefile_Ecore_Wayland.am| 1 - src/lib/ecore_wayland/Ecore_Wayland.h| 92 +-- src/lib/ecore_wayland/ecore_wl.c | 1 - src/lib/ecore_wayland/ecore_wl_private.h | 2 - src/lib/ecore_wayland/ecore_wl_subsurf.c | 191 --- src/lib/ecore_wayland/ecore_wl_window.c | 2 - 6 files changed, 1 insertion(+), 288 deletions(-) -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: also unbreak ecore-wl header with previous reverts...
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=80bcfac650e286971b9267aca33430908427b6e5 commit 80bcfac650e286971b9267aca33430908427b6e5 Author: discomfitor michael.blumenkra...@gmail.com Date: Sat Oct 5 16:38:55 2013 +0100 also unbreak ecore-wl header with previous reverts... --- src/lib/ecore_wayland/Ecore_Wayland.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h index 3588341..05ceb00 100644 --- a/src/lib/ecore_wayland/Ecore_Wayland.h +++ b/src/lib/ecore_wayland/Ecore_Wayland.h @@ -12,7 +12,6 @@ # include wayland-client.h # include wayland-cursor.h # include xkbcommon/xkbcommon.h -# include subsurface-client-protocol.h # ifdef EAPI # undef EAPI --
Re: [E-devel] Git, merges, and better work-flows
*about the merge commit. On Sat, Oct 5, 2013 at 4:36 PM, Tom Hacohen t...@stosb.com wrote: Well. There's a way to avoid that: If you push to a remote branch before merging, there will be no tsunami. A mail will only be sent to the merge commit. On Sat, Oct 5, 2013 at 4:05 PM, Daniel Juyung Seo seojuyu...@gmail.comwrote: I thought the same as David Seikel :) That's why the commit tsunami happened. Anyhow, it's same as before except we now allow merge commit for some cases. Daniel Juyung Seo (SeoZ) On Sat, Oct 5, 2013 at 8:09 PM, Tom Hacohen t...@stosb.com wrote: No. The point is not to squash them, but have one cover-letter commit that holds them all. If you git log --first-parent you won't see all the commits, just the merge commit that describes the whole changeset. On Sat, Oct 5, 2013 at 10:36 AM, David Seikel onef...@gmail.com wrote: On Sat, 5 Oct 2013 17:58:17 +0900 Daniel Juyung Seo seojuyu...@gmail.com wrote: On Fri, Oct 4, 2013 at 11:48 PM, Tom Hacohen tom.haco...@samsung.comwrote: On 04/10/13 15:40, Michael Blumenkrantz wrote: On Fri, 04 Oct 2013 15:18:46 +0100 Tom Hacohen tom.haco...@samsung.com wrote: On 02/10/13 16:17, Tom Hacohen wrote: Hey guys, I would like to suggest a new work-flow. This work-flow will not be mandatory, but just an allowed alternative to the current commit to master approach. At the moment we do not allow merges, at all. This was to prevent people from littering the log with their inability to rebase (git pull --rebase) their local changes on top of the existing commits. This will still remain the same. I'd like to suggest using merges to our advantage. I suggest the following: For fixes, small features, and the like, do the same as you do now. Commit and push to master. For bigger features, rewrites, or any form of a few commits that are tied together by being part of the same set, do as follows (it's obviously simpler than that, I listed everything to over-simplify things): 1. Create a branch (either local or remote) for your change. 2. Work on that branch. 3. When ready, instead of pushing to master: 3. rebase over master (git fetch; git rebase origin/master). 4. switch to master (git checkout master) 6. git merge --no-ff your-feature-branch-name 7. Describe your feature in the commit message. 8. push to master (git push or git push origin master). I've done a few example commits on https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/ This work-flow lets us have linear history, while having feature-sets show as a single merge that can easily be reverted, provide a good description about a feature and the commits that introduced it and I find generally easier for the eye. There are also technical advantages, for example, if you run git log --first-parent you will only see the merge commits, cleaning the log from all the fluff involving a feature letting you just see the feature. Another advantage is that git bisect will not go inside the merged branch unless the issue was introduced there. Please feel free to inspect my repo, more specifically, the log: https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/log/ To see how it looks. Important note: commits on the merge branch should be treated as if they are on master, that is, don't use this as an excuse to make ugly commits with bad commit messages. Again: I'm not trying to make it mandatory, just to allow this sort of merges. Please let me know what you think. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel So, is this a go? May I write up some documentation about it and start doing it? -- Tom. I think you probably could have started documenting it at any point to help those who are interested. I already documented enough to explain the idea, and a more
Re: [E-devel] Git, merges, and better work-flows
Well. There's a way to avoid that: If you push to a remote branch before merging, there will be no tsunami. A mail will only be sent to the merge commit. On Sat, Oct 5, 2013 at 4:05 PM, Daniel Juyung Seo seojuyu...@gmail.comwrote: I thought the same as David Seikel :) That's why the commit tsunami happened. Anyhow, it's same as before except we now allow merge commit for some cases. Daniel Juyung Seo (SeoZ) On Sat, Oct 5, 2013 at 8:09 PM, Tom Hacohen t...@stosb.com wrote: No. The point is not to squash them, but have one cover-letter commit that holds them all. If you git log --first-parent you won't see all the commits, just the merge commit that describes the whole changeset. On Sat, Oct 5, 2013 at 10:36 AM, David Seikel onef...@gmail.com wrote: On Sat, 5 Oct 2013 17:58:17 +0900 Daniel Juyung Seo seojuyu...@gmail.com wrote: On Fri, Oct 4, 2013 at 11:48 PM, Tom Hacohen tom.haco...@samsung.comwrote: On 04/10/13 15:40, Michael Blumenkrantz wrote: On Fri, 04 Oct 2013 15:18:46 +0100 Tom Hacohen tom.haco...@samsung.com wrote: On 02/10/13 16:17, Tom Hacohen wrote: Hey guys, I would like to suggest a new work-flow. This work-flow will not be mandatory, but just an allowed alternative to the current commit to master approach. At the moment we do not allow merges, at all. This was to prevent people from littering the log with their inability to rebase (git pull --rebase) their local changes on top of the existing commits. This will still remain the same. I'd like to suggest using merges to our advantage. I suggest the following: For fixes, small features, and the like, do the same as you do now. Commit and push to master. For bigger features, rewrites, or any form of a few commits that are tied together by being part of the same set, do as follows (it's obviously simpler than that, I listed everything to over-simplify things): 1. Create a branch (either local or remote) for your change. 2. Work on that branch. 3. When ready, instead of pushing to master: 3. rebase over master (git fetch; git rebase origin/master). 4. switch to master (git checkout master) 6. git merge --no-ff your-feature-branch-name 7. Describe your feature in the commit message. 8. push to master (git push or git push origin master). I've done a few example commits on https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/ This work-flow lets us have linear history, while having feature-sets show as a single merge that can easily be reverted, provide a good description about a feature and the commits that introduced it and I find generally easier for the eye. There are also technical advantages, for example, if you run git log --first-parent you will only see the merge commits, cleaning the log from all the fluff involving a feature letting you just see the feature. Another advantage is that git bisect will not go inside the merged branch unless the issue was introduced there. Please feel free to inspect my repo, more specifically, the log: https://git.enlightenment.org/devs/tasn/git-work-flow-example.git/log/ To see how it looks. Important note: commits on the merge branch should be treated as if they are on master, that is, don't use this as an excuse to make ugly commits with bad commit messages. Again: I'm not trying to make it mandatory, just to allow this sort of merges. Please let me know what you think. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel So, is this a go? May I write up some documentation about it and start doing it? -- Tom. I think you probably could have started documenting it at any point to help those who are interested. I already documented enough to explain the idea, and a more detailed explanation is available at the link Peter gave. I will only format it and actually
Re: [E-devel] [EGIT] [core/efl] master 03/03: Revert ecore/wayland: Add subsurface handling APIs.
I created a patch to fix this issue but you reverted everything before I had a chance to get it applied :-/ So I just attached it to https://phab.enlightenment.org/T431 if you want to give it a go. I tested it in a wayland environment... it just needs verified in a non-wayland build setting. U. Artie -Original Message- From: Michael Blumenkrantz [mailto:michael.blumenkra...@gmail.com] Sent: Saturday, October 05, 2013 8:30 AM To: Enlightenment developer list Subject: Re: [E-devel] [EGIT] [core/efl] master 03/03: Revert ecore/wayland: Add subsurface handling APIs. these 3 commits 100% break wayland building on any system, in addition to having broken non-wayland building. test your builds much more thoroughly before committing again. On Sat, 05 Oct 2013 08:29:04 -0700 discomfitor michael.blumenkra...@gmail.com wrote: discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8f493ab6c5975b5346bbd6ee502e9888e4255b8a commit 8f493ab6c5975b5346bbd6ee502e9888e4255b8a Author: discomfitor michael.blumenkra...@gmail.com Date: Sat Oct 5 16:26:24 2013 +0100 Revert ecore/wayland: Add subsurface handling APIs. This reverts commit 65b960f4a60442edcd66082ccc1828b80a49885c. Conflicts: src/lib/ecore_wayland/ecore_wl.c ignore this, I was lazy and didn't edit the message. --- src/Makefile_Ecore_Wayland.am| 1 - src/lib/ecore_wayland/Ecore_Wayland.h| 92 +-- src/lib/ecore_wayland/ecore_wl.c | 1 - src/lib/ecore_wayland/ecore_wl_private.h | 2 - src/lib/ecore_wayland/ecore_wl_subsurf.c | 191 --- src/lib/ecore_wayland/ecore_wl_window.c | 2 - 6 files changed, 1 insertion(+), 288 deletions(-) -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: popup.edc: Follow new namespace.
ryuan pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=617f98ef421cf60c584743d29997f0f58a9a33ae
commit 617f98ef421cf60c584743d29997f0f58a9a33ae
Author: Ryuan Choi ryuan.c...@gmail.com
Date: Sun Oct 6 12:37:13 2013 +0900
popup.edc: Follow new namespace.
Since 7b7c2275, popup style is broken so buttons are not drawn using
default theme.
---
data/themes/widgets/popup.edc | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/data/themes/widgets/popup.edc b/data/themes/widgets/popup.edc
index dbe4dab..e5a06a1 100644
--- a/data/themes/widgets/popup.edc
+++ b/data/themes/widgets/popup.edc
@@ -788,7 +788,7 @@ group { name: elm/popup/content/default;
group { name: elm/popup/buttons1/default;
data.item: action_area_height 140;
parts{
- part{ name:actionbtn1;
+ part{ name:elm.swallow.content.button1;
type: SWALLOW;
scale : 1;
description { state: default 0.0;
@@ -802,7 +802,7 @@ group { name: elm/popup/buttons1/default;
group { name: elm/popup/buttons2/default;
data.item: action_area_height 140;
parts{
- part{ name:actionbtn1;
+ part{ name:elm.swallow.content.button1;
type: SWALLOW;
scale : 1;
description { state: default 0.0;
@@ -827,7 +827,7 @@ group { name: elm/popup/buttons2/default;
rel2.relative: 0.5 1.0;
}
}
- part{ name:actionbtn2;
+ part{ name:elm.swallow.content.button2;
type: SWALLOW;
scale : 1;
description { state: default 0.0;
@@ -848,7 +848,7 @@ group { name: elm/popup/buttons2/default;
group { name: elm/popup/buttons3/default;
data.item: action_area_height 140;
parts{
- part{ name:actionbtn1;
+ part{ name:elm.swallow.content.button1;
type: SWALLOW;
scale : 1;
description { state: default 0.0;
@@ -870,14 +870,14 @@ group { name: elm/popup/buttons3/default;
min: 6 46;
max: 6 46;
fixed : 1 0;
-rel1.to: actionbtn2;
+rel1.to: elm.swallow.content.button2;
rel2 {
relative: 0.0 1.0;
- to: actionbtn2;
+ to: elm.swallow.content.button2;
}
}
}
- part{ name:actionbtn2;
+ part{ name:elm.swallow.content.button2;
type: SWALLOW;
scale : 1;
description { state: default 0.0;
@@ -897,12 +897,12 @@ group { name: elm/popup/buttons3/default;
fixed : 1 0;
rel1 {
relative: 1.0 0.0;
- to: actionbtn2;
+ to: elm.swallow.content.button2;
}
-rel2.to: actionbtn2;
+rel2.to: elm.swallow.content.button2;
}
}
- part{ name:actionbtn3;
+ part{ name:elm.swallow.content.button3;
type: SWALLOW;
scale : 1;
description { state: default 0.0;
--
Re: [E-devel] Wayland and subsurfaces
On Sat, Oct 5, 2013 at 12:05 AM, Rafael Antognolli antogno...@gmail.com wrote: Example usage of what I have just committed (fixes and improvements for Evas_Video_Surface, and added Ecore_Wl_Subsurf) here: https://github.com/antognolli/buffer_object This is a helper, or a skeleton, for creating and setting up the image object that would be used with the buffers. It can be made more generic if necessary, thus allowing to use both Wayland buffers or X stuff. The code itself is inside buffer_object.c. Sample usage is inside main.c. That's exactly the direction where I wanted to get that code. Really nice patch, thanks. The next improvement I was looking for was to use somehow the pixels buffer directly when using OpenGL (zero copy scheme), by looking at your code I do think than in compositing mode we are still doing a copy. Am i right ? Anyway, this can be added somewhere in EFL, I just don't know exactly where would be the best place... ideas? That is indeed a good question. I guess the first place to use this is somewhere in Emotion's gstreamer backend. I would even prefer to see that feature working with VLC backend, but I don't think there is a way to make vlc output the pixels in a wayland surface. Also the gstreamer backend is easier to integrate as it doesn't require to communicate with another process to get the pixels (Not really a win in my opinion, but in this case will make life easier). Also I have been starting to think that maybe we should have a simpler layer than Emotion that does all this buffer management and his used by Emotion. That's just a though right now. -- Cedric BAIL -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
