Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_exebuf.c e_menu.c e_winlist.c
Log Message:
bug--
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_exebuf.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_exebuf.c 1 Jun 2006 05:15:05 -0000 1.19
+++ e_exebuf.c 20 Jun 2006 13:10:08 -0000 1.20
@@ -137,7 +137,12 @@
input_window = ecore_x_window_input_new(zone->container->win, 0, 0, 1, 1);
ecore_x_window_show(input_window);
- e_grabinput_get(input_window, 0, input_window);
+ if (!e_grabinput_get(input_window, 0, input_window))
+ {
+ ecore_x_window_del(input_window);
+ input_window = 0;
+ return 0;
+ }
x = zone->x + 20;
y = zone->y + 20 + ((zone->h - 20 - 20 - 20) / 2);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- e_menu.c 8 Jun 2006 19:01:32 -0000 1.51
+++ e_menu.c 20 Jun 2006 13:10:08 -0000 1.52
@@ -1667,7 +1667,12 @@
zone->x, zone->y,
zone->w, zone->h);
ecore_x_window_show(_e_menu_win);
- e_grabinput_get(_e_menu_win, 1, _e_menu_win);
+ if (!e_grabinput_get(_e_menu_win, 1, _e_menu_win))
+ {
+ ecore_x_window_del(_e_menu_win);
+ _e_menu_win = 0;
+ return;
+ }
}
if ((m->zone) && (m->zone->container != zone->container))
{
@@ -1691,16 +1696,16 @@
}
/* the foreign menu items */
cat = evas_hash_find(_e_menu_categories, m->category);
- if(cat)
- {
- for(l = cat->callbacks; l; l = l->next)
- {
- E_Menu_Category_Callback *cb;
-
- cb = l->data;
- if(cb->create) cb->create(m, cat->data, cb->data);
- }
- }
+ if (cat)
+ {
+ for (l = cat->callbacks; l; l = l->next)
+ {
+ E_Menu_Category_Callback *cb;
+
+ cb = l->data;
+ if (cb->create) cb->create(m, cat->data, cb->data);
+ }
+ }
m->cur.visible = 1;
m->zone = zone;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_winlist.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_winlist.c 16 Feb 2006 06:03:50 -0000 1.42
+++ e_winlist.c 20 Jun 2006 13:10:08 -0000 1.43
@@ -86,7 +86,12 @@
input_window = ecore_x_window_input_new(zone->container->win, 0, 0, 1, 1);
ecore_x_window_show(input_window);
- e_grabinput_get(input_window, 0, input_window);
+ if (!e_grabinput_get(input_window, 0, input_window))
+ {
+ ecore_x_window_del(input_window);
+ input_window = 0;
+ return 0;
+ }
w = (double)zone->w * e_config->winlist_pos_size_w;
if (w > e_config->winlist_pos_max_w) w = e_config->winlist_pos_max_w;
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
