enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

patch from Sergei Kabanov to fix possible crash in efm with udisks/hal backends 

ticket #1529


SVN revision: 76814
This commit is contained in:
Mike Blumenkrantz 2012-09-18 12:16:16 +00:00
parent c162da2523
commit cbb742a7cc
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/e_fm/e_fm_main_hal.c
View File

@ -675,7 +675,8 @@ _e_fm_main_hal_vol_mount_timeout(void *data)
int size;
v->guard = NULL;
dbus_pending_call_cancel(v->op);
if (!dbus_pending_call_get_completed(v->op))
dbus_pending_call_cancel(v->op);
error.name = "org.enlightenment.fm2.MountTimeout";
error.message = "Unable to mount the volume with specified time-out.";
size = _e_fm_main_hal_format_error_msg(&buf, v, &error);
@ -734,7 +735,8 @@ _e_fm_main_hal_vol_unmount_timeout(void *data)
int size;
v->guard = NULL;
dbus_pending_call_cancel(v->op);
if (!dbus_pending_call_get_completed(v->op))
dbus_pending_call_cancel(v->op);
error.name = "org.enlightenment.fm2.UnmountTimeout";
error.message = "Unable to unmount the volume with specified time-out.";
size = _e_fm_main_hal_format_error_msg(&buf, v, &error);
@ -793,7 +795,8 @@ _e_fm_main_hal_vol_eject_timeout(void *data)
int size;
v->guard = NULL;
dbus_pending_call_cancel(v->op);
if (!dbus_pending_call_get_completed(v->op))
dbus_pending_call_cancel(v->op);
error.name = "org.enlightenment.fm2.EjectTimeout";
error.message = "Unable to eject the media with specified time-out.";
size = _e_fm_main_hal_format_error_msg(&buf, v, &error);

9
src/bin/e_fm/e_fm_main_udisks.c
View File

@ -588,7 +588,8 @@ _e_fm_main_udisks_vol_mount_timeout(E_Volume *v)
int size;
v->guard = NULL;
dbus_pending_call_cancel(v->op);
if (!dbus_pending_call_get_completed(v->op))
dbus_pending_call_cancel(v->op);
v->op = NULL;
v->optype = E_VOLUME_OP_TYPE_NONE;
error.name = "org.enlightenment.fm2.MountTimeout";
@ -648,7 +649,8 @@ _e_fm_main_udisks_vol_unmount_timeout(E_Volume *v)
int size;
v->guard = NULL;
dbus_pending_call_cancel(v->op);
if (!dbus_pending_call_get_completed(v->op))
dbus_pending_call_cancel(v->op);
v->op = NULL;
v->optype = E_VOLUME_OP_TYPE_NONE;
error.name = "org.enlightenment.fm2.UnmountTimeout";
@ -709,7 +711,8 @@ _e_fm_main_udisks_vol_eject_timeout(E_Volume *v)
int size;
v->guard = NULL;
dbus_pending_call_cancel(v->op);
if (!dbus_pending_call_get_completed(v->op))
dbus_pending_call_cancel(v->op);
v->op = NULL;
v->optype = E_VOLUME_OP_TYPE_NONE;
error.name = "org.enlightenment.fm2.EjectTimeout";