aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-20 09:14:15 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-20 09:14:15 +0000
commitd82095041d159c90e7cd30fd030ff19b60b28d77 (patch)
tree440d2b97429b219065bcb5c014dcf0fa724b8a45
parent12d37212b5168598c42e8612ff756bc704c5cd59 (diff)
downloadenlightenment-0.17.tar.gz
enlightenment-0.17.tar.xz
enlightenment-0.17.zip
backport previous toolbar gadget popup fixenlightenment-0.17
SVN revision: 84259
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/bin/e_gadcon.c4
-rw-r--r--src/bin/e_toolbar.c1
4 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 326631a8a..76ecc412c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-20 Mike Blumenkrantz
+
+ * toolbar gadgets no longer crash when trying to display a popup
+
2013-02-18 Mike Blumenkrantz
* fixed disable of input methods in input method config dialog
diff --git a/NEWS b/NEWS
index 48f9c49f9..c290e2bf0 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,7 @@ Fixes:
* fixed bug where e_layout would ignore frozen state and crash
* fixed disable of input methods in input method config dialog
* fixed pointer warp when pointer was inside warp window but not directly over it
+ * toolbar gadgets no longer crash when trying to display a popup
Changes since 0.17.0:
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 1c867df4e..37ca9566e 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -746,7 +746,9 @@ e_gadcon_zone_get(E_Gadcon *gc)
{
E_OBJECT_CHECK_RETURN(gc, NULL);
E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL);
- return gc->zone;
+ if (gc->zone) return gc->zone;
+ if (!gc->toolbar) return NULL;
+ return gc->toolbar->fwin->border->zone;
}
EAPI void
diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c
index 9e0920ee0..91b8af2b1 100644
--- a/src/bin/e_toolbar.c
+++ b/src/bin/e_toolbar.c
@@ -103,6 +103,7 @@ e_toolbar_new(Evas *evas, const char *name, E_Win *fwin, Evas_Object *fm2)
e_gadcon_toolbar_set(tbar->gadcon, tbar);
e_gadcon_xdnd_window_set(tbar->gadcon, tbar->fwin->evas_win);
e_gadcon_dnd_window_set(tbar->gadcon, tbar->fwin->evas_win);
+ e_gadcon_ecore_evas_set(tbar->gadcon, tbar->fwin->ecore_evas);
e_gadcon_util_menu_attach_func_set(tbar->gadcon,
_e_toolbar_menu_items_append, tbar);
e_gadcon_populate(tbar->gadcon);