Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
No need to track the drag, as it is assured to be deleted by the dnd code
after e_drag_start has been called.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -3 -r1.199 -r1.200
--- e_mod_main.c 30 Dec 2006 23:32:25 -0000 1.199
+++ e_mod_main.c 2 Jan 2007 19:14:45 -0000 1.200
@@ -52,7 +52,6 @@
int xnum, ynum;
Evas_List *desks;
Pager_Popup *popup;
- E_Drag *drag;
unsigned char dragging : 1;
unsigned char just_dragged : 1;
Evas_Coord dnd_x, dnd_y;
@@ -256,7 +255,6 @@
static void
_pager_free(Pager *p)
{
- if (p->drag) e_object_del(E_OBJECT(p->drag));
_pager_empty(p);
evas_object_del(p->o_table);
free(p);
@@ -476,9 +474,6 @@
{
if ((pw->drag.from_pager) && (pw->desk->pager->dragging))
{
- if (pw->desk->pager->drag)
- e_object_del(E_OBJECT(pw->desk->pager->drag));
- pw->desk->pager->drag = NULL;
pw->desk->pager->dragging = 0;
}
if (pw->o_window) evas_object_del(pw->o_window);
@@ -824,9 +819,6 @@
{
if ((pw->drag.from_pager) && (pw->desk->pager->dragging))
{
- if (pw->desk->pager->drag)
- e_object_del(E_OBJECT(pw->desk->pager->drag));
- pw->desk->pager->drag = NULL;
pw->desk->pager->dragging = 0;
}
evas_object_hide(pw->o_window);
@@ -1438,8 +1430,7 @@
drag =
e_drag_new(pw->desk->pager->inst->gcc->gadcon->zone->container,
x, y, drag_types, 1, pw, -1,
_pager_window_cb_drag_finished);
- pw->desk->pager->drag = drag;
-
+
o = edje_object_add(drag->evas);
edje_object_file_get(pw->o_window, &file, &part);
edje_object_file_set(o, file, part);
@@ -1474,7 +1465,6 @@
pw = drag->data;
if (!pw) return;
evas_object_show(pw->o_window);
- pw->desk->pager->drag = NULL;
if (!dropped)
{
/* wasn't dropped (on pager). move it to position of mouse on screen */
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
