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

Diff of /gtktalog/src/gtktalog/setup.c

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

revision 1.103.2.1 by ymettier, Mon May 19 22:54:55 2003 UTC revision 1.103.2.2 by ymettier, Thu Jun 19 20:37:01 2003 UTC
# Line 18  Line 18 
18    
19  #include <config.h>  #include <config.h>
20  #include <gnome.h>  #include <gnome.h>
21  #ifndef GNOME1  #ifdef USE_GNOMEVFS
22  #include <libgnomevfs/gnome-vfs-mime-info.h>  #include <libgnomevfs/gnome-vfs-mime-info.h>
23  #include <libgnomevfs/gnome-vfs-mime.h>  #include <libgnomevfs/gnome-vfs-mime.h>
24  #endif  #endif
# Line 195  is_mime_valid (gchar * mime) Line 195  is_mime_valid (gchar * mime)
195  /*FIXME: Is there a better way to do this ?  /*FIXME: Is there a better way to do this ?
196   */   */
197    GList *tmp;    GList *tmp;
198  #ifdef GNOME1  #ifdef USE_GNOMEVFS
   tmp = gnome_mime_get_keys (mime);  
 #else  
199    tmp = gnome_vfs_mime_get_key_list (mime);    tmp = gnome_vfs_mime_get_key_list (mime);
200    #else
201      tmp = gnome_mime_get_keys (mime);
202  #endif  #endif
203    if (tmp)    if (tmp)
204      {      {
# Line 2945  extension_to_mime_GUI (GtkWidget * w, gp Line 2945  extension_to_mime_GUI (GtkWidget * w, gp
2945        extension = g_strconcat (".", e =        extension = g_strconcat (".", e =
2946                                 gtk_editable_get_chars (GTK_EDITABLE (entry),                                 gtk_editable_get_chars (GTK_EDITABLE (entry),
2947                                                         0, -1), NULL);                                                         0, -1), NULL);
2948  #ifdef GNOME1  #ifdef USE_GNOMEVFS
       mime = gnome_mime_type_or_default (extension, NULL);  
 #else  
2949        mime = gnome_vfs_mime_type_from_name_or_default (extension, NULL);        mime = gnome_vfs_mime_type_from_name_or_default (extension, NULL);
2950    #else
2951          mime = gnome_mime_type_or_default (extension, NULL);
2952  #endif  #endif
2953        g_free (e);        g_free (e);
2954        g_free (extension);        g_free (extension);

Legend:
Removed from v.1.103.2.1  
changed lines
  Added in v.1.103.2.2

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