diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-12-30 19:04:14 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-02-13 17:25:30 +0100 |
| commit | 5b945325c5b3ed9b08fc888a0ef6144f92eb41de (patch) | |
| tree | f311b646c924b2805887abf2a2fa271ccfe4f709 | |
| parent | 54b62bf72aa1cc76e19f6beb09a3e1faad4da11b (diff) | |
| download | meta-openembedded-contrib-5b945325c5b3ed9b08fc888a0ef6144f92eb41de.tar.gz | |
elementary: partial revert of what was added by r65884 and later renamed and moved
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-efl/recipes-efl/efl/elementary/0001-elementary-dont-add-sub-object-del-callback-somehow-.patch | 27 | ||||
| -rw-r--r-- | meta-efl/recipes-efl/efl/elementary_svn.bb | 4 |
2 files changed, 30 insertions, 1 deletions
diff --git a/meta-efl/recipes-efl/efl/elementary/0001-elementary-dont-add-sub-object-del-callback-somehow-.patch b/meta-efl/recipes-efl/efl/elementary/0001-elementary-dont-add-sub-object-del-callback-somehow-.patch new file mode 100644 index 0000000000..b6e9f24c41 --- /dev/null +++ b/meta-efl/recipes-efl/efl/elementary/0001-elementary-dont-add-sub-object-del-callback-somehow-.patch @@ -0,0 +1,27 @@ +From d77baa896ef377d83e7e2cbdcca3847bdaa2c1f5 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Fri, 30 Dec 2011 18:36:09 +0100 +Subject: [PATCH] elementary: dont add sub-object-del callback, somehow it + breaks shr_elm_softkey + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/lib/elm_win.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c +index b4bdc35..21be4a2 100644 +--- a/src/lib/elm_win.c ++++ b/src/lib/elm_win.c +@@ -1605,7 +1605,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) + evas_object_intercept_show_callback_add(win->win_obj, + _elm_win_obj_intercept_show, win); + +- evas_object_smart_callback_add(win->win_obj, "sub-object-del", (Evas_Smart_Cb)_subobj_del, win); ++ //evas_object_smart_callback_add(win->win_obj, "sub-object-del", (Evas_Smart_Cb)_subobj_del, win); + ecore_evas_name_class_set(win->ee, name, _elm_appname); + ecore_evas_callback_delete_request_set(win->ee, _elm_win_delete_request); + ecore_evas_callback_resize_set(win->ee, _elm_win_resize); +-- +1.7.8.1 + diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb index a0673aef41..815ef525a1 100644 --- a/meta-efl/recipes-efl/efl/elementary_svn.bb +++ b/meta-efl/recipes-efl/efl/elementary_svn.bb @@ -7,7 +7,9 @@ PR = "r1" SRCREV = "${EFL_SRCREV}" inherit efl gettext -SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep" +SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \ + file://0001-elementary-dont-add-sub-object-del-callback-somehow-.patch \ +" S = "${WORKDIR}/${SRCNAME}" EXTRA_OECONF = "\ |