From: Enlightenment C. <no...@cv...> - 2007-08-21 13:11:47
|
Enlightenment CVS committal Author : chaos Project : e17 Module : apps/evfs Dir : e17/apps/evfs/src/bin Modified Files: Makefile.am evfs_server_handle.c evfs_worker.c Log Message: * Evfs/mime part1 (EVFS now *requires* efreet-mime) =================================================================== RCS file: /cvs/e/e17/apps/evfs/src/bin/Makefile.am,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- Makefile.am 16 Aug 2007 11:31:16 -0000 1.28 +++ Makefile.am 21 Aug 2007 13:11:14 -0000 1.29 @@ -6,7 +6,7 @@ DEBUGFLAGS = -DDEBUG -DDEBUG_NEST -W -Wall -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/include @EET_CFLAGS@ @EVAS_CFLAGS@ @ECORE_CFLAGS@ @XML2_CFLAGS@ $(DEBUGFLAGS) -I. -DBINDIR=\""$(bindir)"\" +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/include @EET_CFLAGS@ @EVAS_CFLAGS@ @ECORE_CFLAGS@ @XML2_CFLAGS@ @EFREET_CFLAGS@ $(DEBUGFLAGS) -I. -DBINDIR=\""$(bindir)"\" evfs_SOURCES = \ evfs_main.c \ @@ -49,12 +49,12 @@ evfscopy.c -evfs_LDADD = $(top_builddir)/src/lib/libevfs.la @XML2_LIBS@ @SQLITE_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EET_LIBS@ +evfs_LDADD = $(top_builddir)/src/lib/libevfs.la @XML2_LIBS@ @SQLITE_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EET_LIBS@ @EFREET_LIBS@ -evfscat_LDADD = $(top_builddir)/src/lib/libevfs.la @XML2_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EET_LIBS@ +evfscat_LDADD = $(top_builddir)/src/lib/libevfs.la @XML2_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EET_LIBS@ @EFREET_LIBS@ -evfscopy_LDADD = $(top_builddir)/src/lib/libevfs.la @XML2_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EET_LIBS@ +evfscopy_LDADD = $(top_builddir)/src/lib/libevfs.la @XML2_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EET_LIBS@ @EFREET_LIBS@ -evfsworker_LDADD = $(top_builddir)/src/lib/libevfs.la @XML2_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EET_LIBS@ +evfsworker_LDADD = $(top_builddir)/src/lib/libevfs.la @XML2_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EET_LIBS@ @EFREET_LIBS@ =================================================================== RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_server_handle.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -3 -r1.83 -r1.84 --- evfs_server_handle.c 20 Aug 2007 11:14:40 -0000 1.83 +++ evfs_server_handle.c 21 Aug 2007 13:11:14 -0000 1.84 @@ -757,3 +757,15 @@ (*EVFS_PLUGIN_FILE(plugin)->functions->evfs_auth_push)(command); } } + +void evfs_handle_mime_request(evfs_client* client, evfs_command* command) +{ + if (strcmp(evfs_command_first_file_get(command)->plugin_uri, "file")) { + printf("EVFS: Mime not currently handled for plugin != file\n"); + /*TODO: Transfer file local, then mime? Ugh*/ + } else { + char* mime = efreet_mime_type_get(evfs_command_first_file_get(command)->path); + printf("%s\n", mime); + } +} + =================================================================== RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_worker.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- evfs_worker.c 20 Aug 2007 11:08:17 -0000 1.5 +++ evfs_worker.c 21 Aug 2007 13:11:14 -0000 1.6 @@ -162,6 +162,10 @@ evfs_handle_auth_respond_command(client,command); break; + case EVFS_CMD_MIME_REQUEST: + evfs_handle_mime_request(client,command); + break; + default: printf("Warning - unhandled command %d\n", command->type); break; @@ -481,6 +485,11 @@ return (1); ecore_file_init(); + if (!efreet_mime_init()) + { + printf("Could not init efreet\n"); + return 1; + } server = evfs_server_new(); server->client_hash = |