summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-08-02 07:06:03 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-08-02 07:06:03 +0000
commite0cec4d456881441b216b5f34721255fecb8663a (patch)
tree6174269af8d49fef03d5c2910866747f859826cb /legacy
parentb6a33232ef0055d19519af2a64c056f7f907d520 (diff)
use new ecore fdh function and finally fix eeze mounting without mtab
SVN revision: 74784
Diffstat (limited to 'legacy')
-rw-r--r--legacy/eeze/src/lib/eeze_disk_libmount_new.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/legacy/eeze/src/lib/eeze_disk_libmount_new.c b/legacy/eeze/src/lib/eeze_disk_libmount_new.c
index f55f307317..58115189cc 100644
--- a/legacy/eeze/src/lib/eeze_disk_libmount_new.c
+++ b/legacy/eeze/src/lib/eeze_disk_libmount_new.c
@@ -167,7 +167,6 @@ _eeze_mount_fdh(void *d __UNUSED__, Ecore_Fd_Handler *fdh __UNUSED__)
167 if (!strcmp(src, eeze_disk_devpath_get(disk))) 167 if (!strcmp(src, eeze_disk_devpath_get(disk)))
168 { 168 {
169 found = EINA_TRUE; 169 found = EINA_TRUE;
170 if (disk->mount_status) goto err;
171 break; 170 break;
172 } 171 }
173 } 172 }
@@ -177,6 +176,7 @@ _eeze_mount_fdh(void *d __UNUSED__, Ecore_Fd_Handler *fdh __UNUSED__)
177 case MNT_TABDIFF_MOUNT: 176 case MNT_TABDIFF_MOUNT:
178 disk->mounted = EINA_TRUE; 177 disk->mounted = EINA_TRUE;
179 eina_stringshare_replace(&disk->mount_point, mnt_fs_get_target(new)); 178 eina_stringshare_replace(&disk->mount_point, mnt_fs_get_target(new));
179 if (disk->mount_status) break;
180 e = malloc(sizeof(Eeze_Event_Disk_Mount)); 180 e = malloc(sizeof(Eeze_Event_Disk_Mount));
181 if (e) 181 if (e)
182 { 182 {
@@ -188,6 +188,7 @@ _eeze_mount_fdh(void *d __UNUSED__, Ecore_Fd_Handler *fdh __UNUSED__)
188 if (!mnt_fs_get_target(new)) 188 if (!mnt_fs_get_target(new))
189 disk->mounted = EINA_FALSE; 189 disk->mounted = EINA_FALSE;
190 eina_stringshare_replace(&disk->mount_point, NULL); 190 eina_stringshare_replace(&disk->mount_point, NULL);
191 if (disk->mount_status) break;
191 e = malloc(sizeof(Eeze_Event_Disk_Mount)); 192 e = malloc(sizeof(Eeze_Event_Disk_Mount));
192 if (e) 193 if (e)
193 { 194 {
@@ -201,6 +202,7 @@ _eeze_mount_fdh(void *d __UNUSED__, Ecore_Fd_Handler *fdh __UNUSED__)
201 if (!mnt_fs_get_target(new)) 202 if (!mnt_fs_get_target(new))
202 disk->mounted = EINA_FALSE; 203 disk->mounted = EINA_FALSE;
203 eina_stringshare_replace(&disk->mount_point, mnt_fs_get_target(new)); 204 eina_stringshare_replace(&disk->mount_point, mnt_fs_get_target(new));
205 if (disk->mount_status) break;
204 e = malloc(sizeof(Eeze_Event_Disk_Mount)); 206 e = malloc(sizeof(Eeze_Event_Disk_Mount));
205 if (e) 207 if (e)
206 { 208 {
@@ -436,7 +438,7 @@ eeze_mount_tabs_watch(void)
436 if (_mountinfo < 0) goto error; 438 if (_mountinfo < 0) goto error;
437 if (fcntl(_mountinfo, F_SETFL, O_NONBLOCK) < 0) goto error; 439 if (fcntl(_mountinfo, F_SETFL, O_NONBLOCK) < 0) goto error;
438 440
439 _mountinfo_fdh = ecore_main_fd_handler_add(_mountinfo, ECORE_FD_ERROR, _eeze_mount_fdh, NULL, NULL, NULL); 441 _mountinfo_fdh = ecore_main_fd_handler_file_add(_mountinfo, ECORE_FD_ERROR, _eeze_mount_fdh, NULL, NULL, NULL);
440 if (!_mountinfo_fdh) goto error; 442 if (!_mountinfo_fdh) goto error;
441 _fstab_mon = ecore_file_monitor_add("/etc/fstab", _eeze_mount_tab_watcher, NULL); 443 _fstab_mon = ecore_file_monitor_add("/etc/fstab", _eeze_mount_tab_watcher, NULL);
442 _watching = EINA_TRUE; 444 _watching = EINA_TRUE;