Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src
Modified Files:
dock.c engage.h icon.c
Log Message:
This should fix app close bugs now (crosses fingers)
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/dock.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- dock.c 11 Oct 2004 08:20:25 -0000 1.14
+++ dock.c 11 Oct 2004 10:05:07 -0000 1.15
@@ -261,7 +261,7 @@
{
if (icon->appear_timer)
ecore_timer_del(icon->appear_timer);
- ecore_timer_add(0.05, od_dock_icon_disappear, icon);
+ icon->disappear_timer = ecore_timer_add(0.05, od_dock_icon_disappear, icon);
}
static int
@@ -317,6 +317,11 @@
OD_Icon *i = NULL;
OD_Icon *icon = (OD_Icon *) data;
+ if (icon->disappear_timer) {
+ ecore_timer_del(icon->disappear_timer);
+ icon->disappear_timer = NULL;
+ }
+
if (!(icon->state & OD_ICON_STATE_DISAPPEARING)) {
icon->state &= ~OD_ICON_STATE_USEABLE;
icon->state |= OD_ICON_STATE_DISAPPEARING;
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/engage.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- engage.h 11 Oct 2004 08:20:25 -0000 1.23
+++ engage.h 11 Oct 2004 10:05:08 -0000 1.24
@@ -130,7 +130,7 @@
double x, y; // relative to evas
double scale;
double start_time;
- Ecore_Timer *appear_timer;
+ Ecore_Timer *appear_timer, *disappear_timer;
int launcher;
enum { application_link, minimised_window, system_icon } type;
union {
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/icon.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- icon.c 11 Oct 2004 08:20:25 -0000 1.38
+++ icon.c 11 Oct 2004 10:05:08 -0000 1.39
@@ -296,10 +296,10 @@
assert(icon);
switch (icon->type) {
case application_link:
- assert(icon->data.applnk.winclass);
if (icon->data.applnk.command)
free(icon->data.applnk.command);
- free(icon->data.applnk.winclass);
+ if (icon->data.applnk.winclass)
+ free(icon->data.applnk.winclass);
break;
case minimised_window:
break;
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
