|
From: <enl...@li...> - 2004-12-23 04:59:13
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_config.c e_int_menus.c e_int_menus.h
Log Message:
prototype the correct fn name!
and we dont need to go deletign all items. we cna just delete the entire menu
boject :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_border.c 23 Dec 2004 04:29:31 -0000 1.29
+++ e_border.c 23 Dec 2004 04:58:57 -0000 1.30
@@ -2279,22 +2279,15 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_config.c 20 Dec 2004 21:33:31 -0000 1.9
+++ e_config.c 23 Dec 2004 04:58:57 -0000 1.10
@@ -65,7 +65,7 @@
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;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_menus.c 22 Dec 2004 10:41:03 -0000 1.5
+++ e_int_menus.c 23 Dec 2004 04:58:57 -0000 1.6
@@ -51,7 +51,7 @@
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_Menu *
-e_int_menus_clients_new()
+e_int_menus_clients_new(void)
{
E_Menu *m;
E_Menu_Item *mi;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_menus.h 21 Dec 2004 15:17:01 -0000 1.3
+++ e_int_menus.h 23 Dec 2004 04:58:57 -0000 1.4
@@ -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
|