styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only use evdir.. if its there. 

SVN revision: 38478
This commit is contained in:
Carsten Haitzler 2009-01-06 07:55:03 +00:00
parent 33367511af
commit 6beedeeda2
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/e_fm.c
View File

@ -1901,16 +1901,20 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
switch (e->minor) switch (e->minor)
{ {
case E_FM_OP_HELLO:/*hello*/ case E_FM_OP_HELLO:/*hello*/
// printf("E_FM_OP_HELLO\n");
break; break;
case E_FM_OP_OK:/*req ok*/ case E_FM_OP_OK:/*req ok*/
// printf("E_FM_OP_OK\n");
cl->req--; cl->req--;
break; break;
case E_FM_OP_FILE_ADD:/*file add*/ case E_FM_OP_FILE_ADD:/*file add*/
// printf("E_FM_OP_FILE_ADD\n");
case E_FM_OP_FILE_CHANGE:/*file change*/ case E_FM_OP_FILE_CHANGE:/*file change*/
// printf("E_FM_OP_FILE_CHANGE\n");
{ {
E_Fm2_Finfo finf; E_Fm2_Finfo finf;
p = e->data; p = e->data;
/* NOTE: i am NOT converting this data to portable arch/os independant /* NOTE: i am NOT converting this data to portable arch/os independant
* format. i am ASSUMING e_fm_main and e are local and built together * format. i am ASSUMING e_fm_main and e are local and built together
* and thus this will work. if this ever changes this here needs to * and thus this will work. if this ever changes this here needs to
@ -1936,9 +1940,10 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
finf.rlnk = rlnk; finf.rlnk = rlnk;
evdir = ecore_file_dir_get(path); evdir = ecore_file_dir_get(path);
if ((sd->id == e->ref_to) && if ((evdir) && (sd->id == e->ref_to) &&
((!strcmp(evdir, "") || (!strcmp(dir, evdir))))) ((!strcmp(evdir, "") || (!strcmp(dir, evdir)))))
{ {
// printf(" ch/add response = %i\n", e->response);
if (e->response == 0)/*live changes*/ if (e->response == 0)/*live changes*/
{ {
if (e->minor == E_FM_OP_FILE_ADD)/*file add*/ if (e->minor == E_FM_OP_FILE_ADD)/*file add*/
@ -2003,8 +2008,10 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
} }
else else
{ {
// printf(" ...\n");
if ((sd->id == e->ref_to) && (path[0] == 0)) if ((sd->id == e->ref_to) && (path[0] == 0))
{ {
// printf(" end response = %i\n", e->response);
if (e->response == 2)/* end of scan */ if (e->response == 2)/* end of scan */
{ {
sd->listing = 0; sd->listing = 0;
@ -2023,10 +2030,11 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
} }
} }
} }
free(evdir); if (evdir) free(evdir);
} }
break; break;
case E_FM_OP_FILE_DEL:/*file del*/ case E_FM_OP_FILE_DEL:/*file del*/
// printf("E_FM_OP_FILE_DEL\n");
path = e->data; path = e->data;
evdir = ecore_file_dir_get(path); evdir = ecore_file_dir_get(path);
if ((sd->id == e->ref_to) && (!strcmp(dir, evdir))) if ((sd->id == e->ref_to) && (!strcmp(dir, evdir)))
@ -2037,6 +2045,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
free(evdir); free(evdir);
break; break;
case E_FM_OP_MONITOR_END:/*mon dir del*/ case E_FM_OP_MONITOR_END:/*mon dir del*/
// printf("E_FM_OP_MONITOR_END\n");
path = e->data; path = e->data;
if ((sd->id == e->ref_to) && (!strcmp(dir, path))) if ((sd->id == e->ref_to) && (!strcmp(dir, path)))
{ {