Tag: cws_dev300_jl101 User: jl Date: 2008-05-27 10:03:10+0000 Modified: dba/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
Log: #i90009# enable digital signatures using the same framework as used for Linux / Solaris File Changes: Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: MNSFolders.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx?r1=1.9&r2=1.9.26.1 Delta lines: +7 -3 ------------------- --- MNSFolders.cxx 2008-04-10 10:08:48+0000 1.9 +++ MNSFolders.cxx 2008-05-27 10:03:08+0000 1.9.26.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MNSFolders.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.26.1 $ * * This file is part of OpenOffice.org. * @@ -54,7 +54,7 @@ namespace { - #if defined(XP_MAC) || defined(XP_MACOSX) + #if defined(XP_MAC) || defined(XP_MACOSX) || defined(MACOSX) #define APP_REGISTRY_NAME "Application Registry" #elif defined(XP_WIN) || defined(XP_OS2) #define APP_REGISTRY_NAME "registry.dat" @@ -79,6 +79,10 @@ { "Mozilla/", NULL, NULL }, { "Mozilla/Firefox/", NULL, NULL }, { "Thunderbird/", "Mozilla/Thunderbird/", NULL } + #elif(MACOSX) + { "../Mozilla/", NULL, NULL }, + { "Firefox/", NULL, NULL }, + { "../Thunderbird/", NULL, NULL } #else { ".mozilla/", NULL, NULL }, { ".mozilla/firefox/", NULL, NULL }, File [changed]: MNSProfileDiscover.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx?r1=1.7&r2=1.7.26.1 Delta lines: +3 -3 ------------------- --- MNSProfileDiscover.cxx 2008-04-10 10:12:37+0000 1.7 +++ MNSProfileDiscover.cxx 2008-05-27 10:03:08+0000 1.7.26.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MNSProfileDiscover.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.26.1 $ * * This file is part of OpenOffice.org. * @@ -232,7 +232,7 @@ getter_Copies(regData)); if (NS_FAILED(rv)) continue; -#if defined(XP_MAC) || defined(XP_MACOSX) +#if defined(XP_MAC) || defined(XP_MACOSX) || defined(MACOSX) rv = NS_NewNativeLocalFile(nsCString(), PR_TRUE, getter_AddRefs(tempLocal)); if (NS_SUCCEEDED(rv)) rv = tempLocal->SetPersistentDescriptor(NS_LossyConvertUCS2toASCII(regData)); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
