From 91b495448f821df2ed50115dca382cdca5e87a34 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 23 Dec 2004 04:58:57 +0000 Subject: [PATCH] prototype the correct fn name! and we dont need to go deletign all items. we cna just delete the entire menu boject :) SVN revision: 12562 --- src/bin/e_border.c | 21 +++++++-------------- src/bin/e_config.c | 2 +- src/bin/e_int_menus.c | 4 ++-- src/bin/e_int_menus.h | 2 +- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/bin/e_border.c b/src/bin/e_border.c index 9ccb946c9..6cd1e865a 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -2279,22 +2279,15 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y) E_App *a; if (!_e_border_menu) - _e_border_menu= e_menu_new(); - m = _e_border_menu; - - /* clear menu */ - if (m->items) + _e_border_menu = e_menu_new(); + else { - Evas_List *l; - for (l = m->items; l; l = l->next) - { - E_Menu_Item *mi = l->data; - e_object_free(E_OBJECT(mi)); - } - evas_list_free(m->items); - m->items = NULL; + e_object_unref(E_OBJECT(_e_border_menu)); + _e_border_menu = e_menu_new(); } - + + m = _e_border_menu; + mi = e_menu_item_new(m); e_menu_item_label_set(mi, "Close"); e_menu_item_callback_set(mi, _e_border_menu_cb_close, bd); diff --git a/src/bin/e_config.c b/src/bin/e_config.c index d50c9784b..fa7118bd8 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -65,7 +65,7 @@ e_config_init(void) e_config->menus_click_drag_timeout = DEF_MENUCLICK; e_config->border_shade_animate = 1; e_config->border_shade_transition = E_TRANSITION_DECELERATE; - e_config->border_shade_speed = 2000.0; + e_config->border_shade_speed = 3000.0; e_config->framerate = 30.0; e_config->image_cache = 2048; e_config->font_cache = 512; diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index 89e90b73a..9decf7ea3 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -51,7 +51,7 @@ e_int_menus_about_new(void) subm = e_int_menus_clients_new(); mi = e_menu_item_new(m); - e_menu_item_label_set(mi, "Clients"); + e_menu_item_label_set(mi, "Windows"); e_menu_item_submenu_set(mi, subm); mi = e_menu_item_new(m); @@ -87,7 +87,7 @@ e_int_menus_apps_new(char *dir, int top) } E_Menu * -e_int_menus_clients_new() +e_int_menus_clients_new(void) { E_Menu *m; E_Menu_Item *mi; diff --git a/src/bin/e_int_menus.h b/src/bin/e_int_menus.h index 818828f25..89a602b77 100644 --- a/src/bin/e_int_menus.h +++ b/src/bin/e_int_menus.h @@ -2,7 +2,7 @@ #define E_INT_MENUS_H EAPI E_Menu *e_int_menus_about_new(void); -EAPI E_Menu *e_int_menus_client_new(void); +EAPI E_Menu *e_int_menus_clients_new(void); EAPI E_Menu *e_int_menus_apps_new(char *dir, int top); #endif