aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-20 09:13:03 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-20 09:13:03 +0000
commit88f00310d70a56af39250acc878b8b38c26f0f94 (patch)
tree2465f92b511566d89e10eb07f7385989f3424618 /src
parent8a3cf516923bb3a28c6d3a03fbf36e55d269e4a3 (diff)
downloadenlightenment-88f00310d70a56af39250acc878b8b38c26f0f94.tar.gz
enlightenment-88f00310d70a56af39250acc878b8b38c26f0f94.tar.xz
enlightenment-88f00310d70a56af39250acc878b8b38c26f0f94.zip
e toolbar gadgets no longer crash when trying to display a popup
SVN revision: 84258
Diffstat (limited to 'src')
-rw-r--r--src/bin/e_gadcon.c4
-rw-r--r--src/bin/e_toolbar.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 5c1d2c3a9..769903003 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -748,7 +748,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 adbc3cd9e..106cf168e 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);