From f5de58485bab8022c491df2defd32e37ddfd2efb Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 6 Sep 2006 12:09:53 +0000 Subject: [PATCH] a few patches from emails. :) emails will be coming.. when i flush my mush. SVN revision: 25533 --- TODO | 1 + src/bin/e_apps.c | 2 +- src/bin/e_int_border_menu.c | 17 ++++++++++------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/TODO b/TODO index f3db61d6b..027e862c8 100644 --- a/TODO +++ b/TODO @@ -8,6 +8,7 @@ Some of the things (in very short form) that need to be done to E17... BUGS / FIXES ------------------------------------------------------------------------------- +* BUG: change border type loses window icon * BUG: right click on ibar - select "remove icon" from menu -> segv. * BUG: adding app using "applications" dialog to a bar dir for example means the target bar dir is emptied and only that app is put in. diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c index debc086a0..c7d4a7a2f 100644 --- a/src/bin/e_apps.c +++ b/src/bin/e_apps.c @@ -1820,7 +1820,7 @@ _e_app_free(E_App *a) } if (inst->exe) { -// FIXME: sometimes causes a segv... hrrrm... + ecore_exe_tag_set(inst->exe, NULL); // ecore_exe_free(inst->exe); inst->exe = NULL; } diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c index 5503a745e..a35599d73 100644 --- a/src/bin/e_int_border_menu.c +++ b/src/bin/e_int_border_menu.c @@ -155,13 +155,16 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_theme_edje_file_get("base/theme/borders", "e/widgets/border/default/remember"), "e/widgets/border/default/remember"); - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Borders")); - e_menu_item_callback_set(mi, _e_border_menu_cb_border, bd); - e_menu_item_icon_edje_set(mi, - e_theme_edje_file_get("base/theme/borders", - "e/widgets/border/default/borders"), - "e/widgets/border/default/borders"); + if (!bd->lock_border) + { + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Borders")); + e_menu_item_callback_set(mi, _e_border_menu_cb_border, bd); + e_menu_item_icon_edje_set(mi, + e_theme_edje_file_get("base/theme/borders", + "e/widgets/border/default/borders"), + "e/widgets/border/default/borders"); + } if (!bd->sticky) {