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

Diff of /gtktalog/src/gtktalog/addisk.c

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

revision 1.79 by ymettier, Sun Oct 13 13:23:53 2002 UTC revision 1.79.2.1 by ymettier, Thu Jun 19 20:37:00 2003 UTC
# Line 23  Line 23 
23  #    include <sys/mount.h>  #    include <sys/mount.h>
24  #endif  #endif
25  #include <gnome.h>  #include <gnome.h>
26  #ifndef GNOME1  #ifdef USE_GNOMEVFS
27  #include <libgnomevfs/gnome-vfs-mime.h>  #include <libgnomevfs/gnome-vfs-mime.h>
28    #ifdef GNOME1
29    #include <libgnomevfs/gnome-vfs-uri.h>
30    #else
31  #include <libgnomevfs/gnome-vfs-mime-utils.h>  #include <libgnomevfs/gnome-vfs-mime-utils.h>
32  #endif  #endif
33    #endif
34  #include <sys/stat.h>  #include <sys/stat.h>
35  #include <sys/types.h>  #include <sys/types.h>
36  #include <sys/resource.h>  #include <sys/resource.h>
# Line 812  create_folder_tree (FOLDER * racine, GNo Line 816  create_folder_tree (FOLDER * racine, GNo
816    gchar *infostring;    gchar *infostring;
817    gchar *mime;    gchar *mime;
818    gpointer scan_it;    gpointer scan_it;
819    #ifdef GNOME1
820    #ifdef USE_GNOMEVFS
821      GnomeVFSURI *file_uri;
822    #endif
823    #endif
824    
825    if (added_disk_is_ok == ADDED_DISK_DELETE)    if (added_disk_is_ok == ADDED_DISK_DELETE)
826      {      {
# Line 909  create_folder_tree (FOLDER * racine, GNo Line 918  create_folder_tree (FOLDER * racine, GNo
918                    alarm (5);                    alarm (5);
919                    if (!setjmp (context))                    if (!setjmp (context))
920  #endif  #endif
921    #ifdef GNOME1
922    #ifdef USE_GNOMEVFS
923    //            printf("%s %d <%s>\n", __FILE__,__LINE__,file);
924                        file_uri = gnome_vfs_uri_new (file);
925    //            printf("%s %d\n", __FILE__,__LINE__);
926                      mime = g_strdup (gnome_vfs_get_mime_type (file_uri));
927                      gnome_vfs_uri_unref (file_uri);
928    #else
929                      mime = g_strdup (gnome_vfs_get_mime_type (file));                      mime = g_strdup (gnome_vfs_get_mime_type (file));
930    #endif
931    #else
932                        mime = g_strdup (gnome_vfs_get_mime_type (file));
933    #endif
934  #ifdef USE_SETJMP  #ifdef USE_SETJMP
935                    alarm (0);                    alarm (0);
936  #endif  #endif

Legend:
Removed from v.1.79  
changed lines
  Added in v.1.79.2.1

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