Enlightenment CVS committal

Author  : lordchaos
Project : e17
Module  : proto

Dir     : e17/proto/entropy/src/plugins


Modified Files:
        ewl_icon_local_viewer.c filesystem.c mime.c 


Log Message:
* Don't make a dup of a file, if we get the new file notification late and 
we've already (somehow) got the new file
* Start of file remove notify code

===================================================================
RCS file: 
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/ewl_icon_local_viewer.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_icon_local_viewer.c     22 Oct 2005 06:00:57 -0000      1.6
+++ ewl_icon_local_viewer.c     23 Oct 2005 01:05:48 -0000      1.7
@@ -482,6 +482,8 @@
        /*Register our interest in receiving file mod/create/delete 
notifications*/
        entropy_core_component_event_register(core, instance, 
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_CHANGE));
        entropy_core_component_event_register(core, instance, 
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_CREATE));
+       entropy_core_component_event_register(core, instance, 
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_REMOVE));
+       
 
        /*Register interest in getting stat events*/
        entropy_core_component_event_register(core, instance, 
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_STAT));
@@ -499,7 +501,7 @@
                Ewl_IconBox_Icon* icon;
                gui_file* gui_object;
 
-       
+               if (!ecore_hash_get(view->gui_hash, list_item)) {       
                         entropy_core_file_cache_add_reference(comp->core, 
list_item->md5);                     
                         char* mime;
                         /*printf("%s\n", list_item->filename);*/
@@ -532,6 +534,7 @@
                                entropy_notify_event_callback_add(ev, 
(void*)gui_event_callback, comp);
                                
entropy_notify_event_commit(comp->core->notify,ev);
                        }
+               }
                        
 }
 
@@ -634,6 +637,11 @@
        }
        break;
 
+       case ENTROPY_NOTIFY_FILE_REMOVE: {
+               printf("Received a remove file notify\n");
+       }
+       break;
+
        case ENTROPY_NOTIFY_FILE_STAT_EXECUTED: {
                //printf("STAT EXECUTED Response back at 
ewl_icon_local_viewer\n");
        }
@@ -642,9 +650,7 @@
        case ENTROPY_NOTIFY_FILE_STAT_AVAILABLE: {
                                                        
                entropy_file_stat* file_stat = (entropy_file_stat*)ret;
-
                if (file_stat->file == NULL) { printf ( "***** File stat file 
is null\n"); }
-
                ewl_icon_local_viewer_show_stat(file_stat);
                
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- filesystem.c        20 Oct 2005 08:45:54 -0000      1.1
+++ filesystem.c        23 Oct 2005 01:05:48 -0000      1.2
@@ -101,6 +101,11 @@
                                                                case 
EVFS_FILE_EV_CHANGE: //printf("  Change event\n");
                                                                  
gui_event->event_type = 
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_CHANGE);
                                                                  break;
+                                                               case 
EVFS_FILE_EV_REMOVE: //printf("  Change event\n");
+                                                                 
gui_event->event_type = 
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_REMOVE);
+                                                                 break;
+
+                                                               
                                                }       
                                                
                                                gui_event->data = file; 
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/mime.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- mime.c      20 Oct 2005 08:45:54 -0000      1.1
+++ mime.c      23 Oct 2005 01:05:48 -0000      1.2
@@ -63,6 +63,7 @@
                else if (!strcmp(pos, ".html")) type = "text/html";
                else if (!strcmp(pos, ".c")) type = "text/csrc";
                else if (!strcmp(pos, ".mpg")) type = "video/mpeg";
+               else if (!strcmp(pos, ".mpe")) type = "video/mpeg";
                else if (!strcmp(pos, ".mpeg")) type = "video/mpeg";
                else if (!strcmp(pos, ".avi")) type = "video/x-msvideo";
                




-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to