enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

e: e_fm udisk ported to edbus 

Patch by: José Roberto de Souza  <zehortigoza@profusion.mobi>



SVN revision: 81985
This commit is contained in:
José Roberto de Souza 2013-01-02 13:16:19 +00:00 committed by Lucas De Marchi
parent 5655cbf8af
commit 5e4352e9b3
6 changed files with 696 additions and 511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -457,7 +457,6 @@ ecore-file >= $efl_version \
ecore-ipc >= $efl_version \
eet >= $efl_version \
efreet >= $efl_version \
edbus >= $efl_version \
edbus2 >= $efl_version \
eina >= $efl_version"
efm_requires="$efm_requires $eeze_mount $dbus_mount $hal_mount $udisks_mount"
@ -469,8 +468,6 @@ PKG_CHECK_MODULES(E_FM_CMDLINE, [
ecore >= ${efl_version}
ecore-file >= ${efl_version}
edbus2 >= ${efl_version}
edbus >= ${efl_version}
dbus-1
])
PKG_CHECK_MODULES(E_FM_OP, [

2
src/bin/e_fm.c
View File

@ -2962,7 +2962,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
e_fm2_device_volume_add(v);
if (v->mounted)
e_fm2_device_mount(v, NULL, NULL, NULL, NULL, NULL);
else if (e_config->device_auto_mount && !v->mounted && !v->first_time)
else if (e_config->device_auto_mount && !v->first_time)
_e_fm2_client_mount(v->udi, v->mount_point);
if (e_config->device_desktop)
e_fm2_device_show_desktop_icons();

2
src/bin/e_fm/e_fm_main.c
View File

@ -71,7 +71,7 @@ static Efm_Mode mode = EFM_MODE_USING_RASTER_MOUNT;
/* FIXME: things to add to the slave enlightenment_fm process and ipc to e:
*
* * reporting results of fop's (current status - what has been don, what failed etc.)
* * dbus removable device monitoring (in e17 itself now via e_dbus - move to enlightenment_fm and ipc removable device add/del and anything else)
* * dbus removable device monitoring (in e17 itself now via edbus - move to enlightenment_fm and ipc removable device add/del and anything else)
* * mount/umount of removable devices (to go along with removable device support - put it in here and message back mount success/failure and where it is now mounted - remove from e17 itself)
*
*/

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

File diff suppressed because it is too large Load Diff

8
src/bin/e_fm_shared_device.c
View File

@ -18,7 +18,8 @@ _e_fm_shared_device_storage_free(E_Storage *s)
eina_stringshare_del(s->serial);
eina_stringshare_del(s->icon.drive);
eina_stringshare_del(s->icon.volume);
#ifdef HAVE_EEZE_MOUNT
eina_stringshare_del(s->dbus_path);
#if HAVE_EEZE_MOUNT
if (s->disk) eeze_disk_free(s->disk);
#endif
free(s);
@ -30,8 +31,8 @@ _e_fm_shared_device_volume_free(E_Volume *v)
{
if (v->storage)
{
v->storage->volumes = eina_list_remove(v->storage->volumes, v);
v->storage = NULL;
v->storage->volumes = eina_list_remove(v->storage->volumes, v);
v->storage = NULL;
}
if (v->udi) eina_stringshare_del(v->udi);
if (v->uuid) eina_stringshare_del(v->uuid);
@ -41,5 +42,6 @@ _e_fm_shared_device_volume_free(E_Volume *v)
if (v->partition_label) eina_stringshare_del(v->partition_label);
if (v->mount_point) eina_stringshare_del(v->mount_point);
if (v->parent) eina_stringshare_del(v->parent);
eina_stringshare_del(v->dbus_path);
free(v);
}

11
src/bin/e_fm_shared_types.h.in
View File

@ -9,7 +9,7 @@
# include <Eeze_Disk.h>
#endif
#if @DBUS_MOUNT_CONFIG@
# include <E_DBus.h>
# include <EDBus.h>
#endif
# define E_DEVICE_TYPE_STORAGE 1
@ -70,6 +70,10 @@ struct _E_Storage
Eina_Bool validated : 1;
Eina_Bool trackable : 1;
#if @DBUS_MOUNT_CONFIG@
EDBus_Proxy *proxy;
const char *dbus_path;
#endif
#if @EEZE_MOUNT_CONFIG@
Eeze_Disk *disk;
#endif
@ -107,8 +111,9 @@ struct _E_Volume
Eina_Bool unlocked;
#if @DBUS_MOUNT_CONFIG@
DBusPendingCall *op; // d-bus call handle
void *prop_handler;
EDBus_Pending *op;
EDBus_Proxy *proxy;
const char *dbus_path;
#endif
#if @EEZE_MOUNT_CONFIG@
Eeze_Disk *disk;