Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_zone.c
Log Message:
hoo famn. segv. fixed.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -3 -r1.306 -r1.307
--- e_border.c 1 Jul 2005 11:23:10 -0000 1.306
+++ e_border.c 1 Jul 2005 13:21:29 -0000 1.307
@@ -2648,11 +2648,14 @@
bd->resize_mode = RESIZE_TL;
bd->cur_mouse_action = e_action_find("window_resize");
- if ((!bd->cur_mouse_action->func.end_mouse) &&
- (!bd->cur_mouse_action->func.end))
- bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
- e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ {
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
+ if (bd->cur_mouse_action)
+ e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ }
GRAV_SET(bd, ECORE_X_GRAVITY_SE);
}
else if (e->direction == RESIZE_T)
@@ -2662,11 +2665,14 @@
bd->resize_mode = RESIZE_T;
bd->cur_mouse_action = e_action_find("window_resize");
- if ((!bd->cur_mouse_action->func.end_mouse) &&
- (!bd->cur_mouse_action->func.end))
- bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
- e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ {
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
+ if (bd->cur_mouse_action)
+ e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ }
GRAV_SET(bd, ECORE_X_GRAVITY_S);
}
else if (e->direction == RESIZE_TR)
@@ -2676,11 +2682,14 @@
bd->resize_mode = RESIZE_TR;
bd->cur_mouse_action = e_action_find("window_resize");
- if ((!bd->cur_mouse_action->func.end_mouse) &&
- (!bd->cur_mouse_action->func.end))
- bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
- e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ {
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
+ if (bd->cur_mouse_action)
+ e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ }
GRAV_SET(bd, ECORE_X_GRAVITY_SW);
}
else if (e->direction == RESIZE_R)
@@ -2690,11 +2699,14 @@
bd->resize_mode = RESIZE_R;
bd->cur_mouse_action = e_action_find("window_resize");
- if ((!bd->cur_mouse_action->func.end_mouse) &&
- (!bd->cur_mouse_action->func.end))
- bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
- e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ {
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
+ if (bd->cur_mouse_action)
+ e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ }
GRAV_SET(bd, ECORE_X_GRAVITY_W);
}
else if (e->direction == RESIZE_BR)
@@ -2704,11 +2716,14 @@
bd->resize_mode = RESIZE_BR;
bd->cur_mouse_action = e_action_find("window_resize");
- if ((!bd->cur_mouse_action->func.end_mouse) &&
- (!bd->cur_mouse_action->func.end))
- bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
- e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ {
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
+ if (bd->cur_mouse_action)
+ e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ }
GRAV_SET(bd, ECORE_X_GRAVITY_NW);
}
else if (e->direction == RESIZE_B)
@@ -2718,11 +2733,14 @@
bd->resize_mode = RESIZE_B;
bd->cur_mouse_action = e_action_find("window_resize");
- if ((!bd->cur_mouse_action->func.end_mouse) &&
- (!bd->cur_mouse_action->func.end))
- bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
- e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ {
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
+ if (bd->cur_mouse_action)
+ e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ }
GRAV_SET(bd, ECORE_X_GRAVITY_N);
}
else if (e->direction == RESIZE_BL)
@@ -2732,11 +2750,14 @@
bd->resize_mode = RESIZE_BL;
bd->cur_mouse_action = e_action_find("window_resize");
- if ((!bd->cur_mouse_action->func.end_mouse) &&
- (!bd->cur_mouse_action->func.end))
- bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
- e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ {
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
+ if (bd->cur_mouse_action)
+ e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ }
GRAV_SET(bd, ECORE_X_GRAVITY_NE);
}
else if (e->direction == RESIZE_L)
@@ -2746,11 +2767,14 @@
bd->resize_mode = RESIZE_L;
bd->cur_mouse_action = e_action_find("window_resize");
- if ((!bd->cur_mouse_action->func.end_mouse) &&
- (!bd->cur_mouse_action->func.end))
- bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
- e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ {
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
+ if (bd->cur_mouse_action)
+ e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ }
GRAV_SET(bd, ECORE_X_GRAVITY_E);
}
else if (e->direction == MOVE)
@@ -2760,11 +2784,14 @@
bd->moving = 1;
bd->cur_mouse_action = e_action_find("window_move");
- if ((!bd->cur_mouse_action->func.end_mouse) &&
- (!bd->cur_mouse_action->func.end))
- bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
- e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ {
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
+ if (bd->cur_mouse_action)
+ e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ }
}
return 1;
}
@@ -3215,11 +3242,14 @@
bd->cur_mouse_action =
e_bindings_mouse_down_event_handle(E_BINDING_CONTEXT_BORDER,
E_OBJECT(bd), ev);
- if ((!bd->cur_mouse_action->func.end_mouse) &&
- (!bd->cur_mouse_action->func.end))
- bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
- e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ {
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
+ if (bd->cur_mouse_action)
+ e_object_ref(E_OBJECT(bd->cur_mouse_action));
+ }
}
e_focus_event_mouse_down(bd);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- e_zone.c 1 Jul 2005 11:05:48 -0000 1.64
+++ e_zone.c 1 Jul 2005 13:21:41 -0000 1.65
@@ -572,11 +572,14 @@
zone->cur_mouse_action =
e_bindings_mouse_down_event_handle(E_BINDING_CONTEXT_ZONE,
E_OBJECT(zone), ev2);
- if ((!zone->cur_mouse_action->func.end_mouse) &&
- (!zone->cur_mouse_action->func.end))
- zone->cur_mouse_action = NULL;
if (zone->cur_mouse_action)
- e_object_ref(E_OBJECT(zone->cur_mouse_action));
+ {
+ if ((!zone->cur_mouse_action->func.end_mouse) &&
+ (!zone->cur_mouse_action->func.end))
+ zone->cur_mouse_action = NULL;
+ if (zone->cur_mouse_action)
+ e_object_ref(E_OBJECT(zone->cur_mouse_action));
+ }
}
}
}
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
