[beepmp-cvs] bmp/beep main.c,1.132.2.1,1.132.2.2 main.h,1.30.2.2,1.30.2.3

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

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

Modified Files:
      Tag: release_0_9_7_1
	main.c main.h 
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: main.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/main.c,v
retrieving revision 1.132.2.1
retrieving revision 1.132.2.2
diff -C2 -d -r1.132.2.1 -r1.132.2.2
*** main.c	23 Mar 2005 04:55:10 -0000	1.132.2.1
--- main.c	27 Aug 2005 11:20:04 -0000	1.132.2.2
***************
*** 48,51 ****
--- 48,52 ----
  #include "libbeep/beepctrl.h"
  #include "libbeep/util.h"
+ #include "libbeep/vfs.h"
  
  #include "controlsocket.h"
***************
*** 928,940 ****
      }
  
! #ifdef HAVE_GNOME_VFS
!     if (!gnome_vfs_init()) {
!         g_printerr(_("Could not initialize gnome-vfs.\n"));
          exit(EXIT_FAILURE);
      }
  
-     g_atexit(gnome_vfs_shutdown);
- #endif
- 
      signal(SIGPIPE, SIG_IGN);   /* for controlsocket.c */
      signal(SIGSEGV, segfault_handler);
--- 929,937 ----
      }
  
!     if (!vfs_init()) {
!         g_printerr(Q_("Could not initialize VFS.\n"));
          exit(EXIT_FAILURE);
      }
  
      signal(SIGPIPE, SIG_IGN);   /* for controlsocket.c */
      signal(SIGSEGV, segfault_handler);

Index: main.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/main.h,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -C2 -d -r1.30.2.2 -r1.30.2.3
*** main.h	15 Jun 2005 00:28:54 -0000	1.30.2.2
--- main.h	27 Aug 2005 11:20:05 -0000	1.30.2.3
***************
*** 23,30 ****
  #define MAIN_H
  
- #ifdef HAVE_GNOME_VFS
- #include <libgnomevfs/gnome-vfs.h>
- #endif
- 
  #include "mainwin.h"
  #include "textbox.h"
--- 23,26 ----