Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
Cleanup.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_mod_main.c 4 May 2005 11:04:08 -0000 1.42
+++ e_mod_main.c 4 May 2005 12:16:16 -0000 1.43
@@ -74,7 +74,7 @@
static void _ibar_bar_cb_move(void *data, const char *type, void *event);
static void _ibar_bar_cb_leave(void *data, const char *type, void *event);
static void _ibar_bar_cb_drop(void *data, const char *type, void *event);
-static void _ibar_bar_cb_finished(void *data, const char *type, int
dropped);
+static void _ibar_bar_cb_finished(E_Drag *drag, int dropped);
static void _ibar_icon_cb_intercept_move(void *data, Evas_Object *o,
Evas_Coord x, Evas_Coord y);
static void _ibar_icon_cb_intercept_resize(void *data, Evas_Object *o,
Evas_Coord w, Evas_Coord h);
@@ -1244,11 +1244,16 @@
dist = sqrt(pow((ev->cur.output.x - drag_x), 2) + pow((ev->cur.output.y
- drag_y), 2));
if (dist > 10)
{
+ E_Drag *d;
+
drag = 1;
drag_start = 0;
- e_drag_start(ic->ibb->con,
- "enlightenment/eapp", ic->app, _ibar_bar_cb_finished,
- ic->app->path, "icon");
+
+ d = e_drag_new(ic->ibb->con,
+ "enlightenment/eapp", ic->app,
_ibar_bar_cb_finished,
+ ic->app->path, "icon");
+ e_drag_resize(d, ic->ibb->ibar->conf->iconsize,
ic->ibb->ibar->conf->iconsize);
+ e_drag_start(d);
evas_event_feed_mouse_up(ic->ibb->evas, 1, EVAS_BUTTON_NONE, NULL);
e_app_remove(ic->app);
}
@@ -1528,13 +1533,12 @@
}
static void
-_ibar_bar_cb_finished(void *data, const char *type, int dropped)
+_ibar_bar_cb_finished(E_Drag *drag, int dropped)
{
- /* Someone took over the eapp. */
- if (dropped) return;
-
/* Unref the object so it will be deleted. */
- e_object_unref(E_OBJECT(data));
+ if (!dropped)
+ e_object_unref(E_OBJECT(drag->data));
+ e_drag_del(drag);
}
static void
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
