/[gtktalog]/gtktalog/src/gtktalog/vfs.c
ViewVC logotype

Diff of /gtktalog/src/gtktalog/vfs.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.27 by ymettier, Fri Oct 4 22:10:02 2002 UTC revision 1.27.2.1 by ymettier, Thu Jun 19 20:37:01 2003 UTC
# Line 19  Line 19 
19  #define _USE_BSD  #define _USE_BSD
20  #include <config.h>  #include <config.h>
21  #include <gnome.h>  #include <gnome.h>
22  #ifndef GNOME1  #ifdef USE_GNOMEVFS
23  #include <libgnomevfs/gnome-vfs-mime.h>  #include <libgnomevfs/gnome-vfs-mime.h>
24  #include <libgnomevfs/gnome-vfs-mime-utils.h>  //#include <libgnomevfs/gnome-vfs-mime-utils.h>
25  #endif  #endif
26  #include <sys/types.h>  #include <sys/types.h>
27  #include <unistd.h>  #include <unistd.h>
# Line 459  vfs_read (GNode * gn, gchar * vfs_file_n Line 459  vfs_read (GNode * gn, gchar * vfs_file_n
459    gchar **args_ptr;    gchar **args_ptr;
460    const gchar *mime;    const gchar *mime;
461    gboolean vfs_scan_nok = FALSE;    gboolean vfs_scan_nok = FALSE;
462    #ifdef GNOME1
463    #ifdef USE_GNOMEVFS
464      GnomeVFSURI *file_uri;
465    #endif
466    #endif
467    
468    mime = NULL;    mime = NULL;
469    if (my_config->scan_mime_types)    if (my_config->scan_mime_types)
# Line 469  vfs_read (GNode * gn, gchar * vfs_file_n Line 474  vfs_read (GNode * gn, gchar * vfs_file_n
474        alarm (5);        alarm (5);
475        if (!setjmp (context))        if (!setjmp (context))
476  #endif  #endif
477    #ifdef GNOME1
478    #ifdef USE_GNOMEVFS
479            file_uri = gnome_vfs_uri_new (vfs_file_name);
480          mime = g_strdup (gnome_vfs_get_mime_type (file_uri));
481          gnome_vfs_uri_unref (file_uri);
482    #else
483          mime = g_strdup (gnome_vfs_get_mime_type (vfs_file_name));          mime = g_strdup (gnome_vfs_get_mime_type (vfs_file_name));
484    #endif
485    #else
486            mime = g_strdup (gnome_vfs_get_mime_type (vfs_file_name));
487    #endif
488  #ifdef USE_SETJMP  #ifdef USE_SETJMP
489        alarm (0);        alarm (0);
490  #endif  #endif

Legend:
Removed from v.1.27  
changed lines
  Added in v.1.27.2.1

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26