[Amizilla-cvs] amizilla/xpcom/io nsDirectoryService.cpp,1.2,1.3

[Jeff S. <jsh...@us...>]

Update of /cvsroot/amizilla/amizilla/xpcom/io
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1780

Modified Files:
	nsDirectoryService.cpp 
Log Message:
Use PROGDIR: for directories.


Index: nsDirectoryService.cpp
===================================================================
RCS file: /cvsroot/amizilla/amizilla/xpcom/io/nsDirectoryService.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsDirectoryService.cpp	18 Jul 2004 00:32:49 -0000	1.2
--- nsDirectoryService.cpp	11 Oct 2004 21:14:50 -0000	1.3
***************
*** 60,63 ****
--- 60,65 ----
  #include <sys/param.h>
  #include "prenv.h"
+ #elif defined(XP_AMIGAOS)
+ #include <proto/dos.h>
  #ifdef XP_MACOSX
  #include <CoreServices/CoreServices.h>
***************
*** 318,324 ****
      }
  #elif defined(XP_AMIGAOS)
!     localFile->InitWithNativePath(nsDependentCString("progdir:"));
!     *aFile = localFile;
!     return NS_OK;
  #endif
      
--- 320,330 ----
      }
  #elif defined(XP_AMIGAOS)
!     {
!         char progdir[10];
!         strcpy(progdir, "PROGDIR:");
!         localFile->InitWithNativePath(nsDependentCString(progdir));
!         *aFile = localFile;
!         return NS_OK;
!     }
  #endif
      
***************
*** 530,539 ****
  {
      nsresult rv;
-       
      rv = NS_NewISupportsArray(getter_AddRefs(mProviders));
      if (NS_FAILED(rv)) return rv;
  
      NS_RegisterStaticAtoms(directory_atoms, NS_ARRAY_LENGTH(directory_atoms));
-     
      // Let the list hold the only reference to the provider.
      nsAppFileLocationProvider *defaultProvider = new nsAppFileLocationProvider;
--- 536,543 ----
***************
*** 542,546 ****
      // AppendElement returns PR_TRUE for success.
      rv = mProviders->AppendElement(defaultProvider) ? NS_OK : NS_ERROR_FAILURE;
- 
      return rv;
  }
--- 546,549 ----