[beepmp-cvs] bmp/libbeep vfs.h,1.4,1.4.8.1 vfs_gnome.c,1.4,1.4.8.1 vfs_stdio.c,1.4,1.4.8.1

[Chong K. X. <des...@us...>]

Update of /cvsroot/beepmp/bmp/libbeep
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10554/libbeep

Modified Files:
      Tag: release_0_9_7_1
	vfs.h vfs_gnome.c vfs_stdio.c 
Log Message:

* beep/main.c, beep/main.h, libbeep/vfs.h, libbeep/vfs_gnome.c, 
libbeep/vfs_stdio.h: Merge VFS initialization changes from HEAD.


Index: vfs_gnome.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/libbeep/vfs_gnome.c,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -C2 -d -r1.4 -r1.4.8.1
*** vfs_gnome.c	8 Jul 2004 01:48:33 -0000	1.4
--- vfs_gnome.c	27 Aug 2005 11:20:05 -0000	1.4.8.1
***************
*** 30,33 ****
--- 30,43 ----
                                gboolean * append);
  
+ gboolean
+ vfs_init(void)
+ {
+     if (!gnome_vfs_init())
+ 	return FALSE;
+ 
+     g_atexit(gnome_vfs_shutdown);
+     return TRUE;
+ }
+ 
  VFSFile *
  vfs_fopen(const gchar * path,

Index: vfs_stdio.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/libbeep/vfs_stdio.c,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -C2 -d -r1.4 -r1.4.8.1
*** vfs_stdio.c	8 Jul 2004 01:48:33 -0000	1.4
--- vfs_stdio.c	27 Aug 2005 11:20:05 -0000	1.4.8.1
***************
*** 27,30 ****
--- 27,36 ----
  
  
+ gboolean
+ vfs_init(void)
+ {
+     return TRUE;
+ }
+ 
  VFSFile *
  vfs_fopen(const gchar * path,

Index: vfs.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/libbeep/vfs.h,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -C2 -d -r1.4 -r1.4.8.1
*** vfs.h	8 Jul 2004 01:48:33 -0000	1.4
--- vfs.h	27 Aug 2005 11:20:05 -0000	1.4.8.1
***************
*** 9,12 ****
--- 9,15 ----
  G_BEGIN_DECLS
  
+ /* Reserved for private use by BMP */
+ gboolean vfs_init(void);
+ 
  VFSFile * vfs_fopen(const gchar * path,
                      const gchar * mode);