summaryrefslogtreecommitdiff
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
parent8a3cf516923bb3a28c6d3a03fbf36e55d269e4a3 (diff)
e toolbar gadgets no longer crash when trying to display a popup
SVN revision: 84258
-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 d6b58ecd8..7012b7330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-02-20 Mike Blumenkrantz
2
3 * toolbar gadgets no longer crash when trying to display a popup
4
12013-02-19 Mike Blumenkrantz 52013-02-19 Mike Blumenkrantz
2 6
3 * e_util_size_debug_set now displays delete events 7 * e_util_size_debug_set now displays delete events
diff --git a/NEWS b/NEWS
index 5054b355b..9ecd22b73 100644
--- a/NEWS
+++ b/NEWS
@@ -183,3 +183,4 @@ Fixes:
183 * fixed bug where e_layout would ignore frozen state and crash 183 * fixed bug where e_layout would ignore frozen state and crash
184 * fixed disable of input methods in input method config dialog 184 * fixed disable of input methods in input method config dialog
185 * fixed pointer warp when pointer was inside warp window but not directly over it 185 * fixed pointer warp when pointer was inside warp window but not directly over it
186 * toolbar gadgets no longer crash when trying to display a popup
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)
748{ 748{
749 E_OBJECT_CHECK_RETURN(gc, NULL); 749 E_OBJECT_CHECK_RETURN(gc, NULL);
750 E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL); 750 E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL);
751 return gc->zone; 751 if (gc->zone) return gc->zone;
752 if (!gc->toolbar) return NULL;
753 return gc->toolbar->fwin->border->zone;
752} 754}
753 755
754EAPI void 756EAPI 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)
103 e_gadcon_toolbar_set(tbar->gadcon, tbar); 103 e_gadcon_toolbar_set(tbar->gadcon, tbar);
104 e_gadcon_xdnd_window_set(tbar->gadcon, tbar->fwin->evas_win); 104 e_gadcon_xdnd_window_set(tbar->gadcon, tbar->fwin->evas_win);
105 e_gadcon_dnd_window_set(tbar->gadcon, tbar->fwin->evas_win); 105 e_gadcon_dnd_window_set(tbar->gadcon, tbar->fwin->evas_win);
106 e_gadcon_ecore_evas_set(tbar->gadcon, tbar->fwin->ecore_evas);
106 e_gadcon_util_menu_attach_func_set(tbar->gadcon, 107 e_gadcon_util_menu_attach_func_set(tbar->gadcon,
107 _e_toolbar_menu_items_append, tbar); 108 _e_toolbar_menu_items_append, tbar);
108 e_gadcon_populate(tbar->gadcon); 109 e_gadcon_populate(tbar->gadcon);