svnno****@sourc*****
svnno****@sourc*****
Tue Mar 11 20:40:20 JST 2008
Revision: 3473
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3473
Author: ikezoe
Date: 2008-03-11 20:40:19 +0900 (Tue, 11 Mar 2008)
Log Message:
-----------
* macro/gecko.m4, module/embed/gecko/kz-mozlauncher.[cpp|h],
module/embed/gecko/kz-mozfilepicker.cpp,
module/embed/gecko/kz-moz-wrapper.cpp: Remove old codes. I confirmed
xulrunner-1,9b and firefox2.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/kz-mozfilepicker.cpp
kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp
kazehakase/trunk/module/embed/gecko/kz-mozlauncher.h
kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-03-11 11:20:54 UTC (rev 3472)
+++ kazehakase/trunk/ChangeLog 2008-03-11 11:40:19 UTC (rev 3473)
@@ -2,6 +2,10 @@
* module/embed/gecko/kz-gecko-embed.cpp: Implement get_password() for
xulrunner.
+ * macro/gecko.m4, module/embed/gecko/kz-mozlauncher.[cpp|h],
+ module/embed/gecko/kz-mozfilepicker.cpp,
+ module/embed/gecko/kz-moz-wrapper.cpp: Remove old codes. I confirmed
+ xulrunner-1,9b and firefox2.
2008-03-10 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/module/embed/gecko/kz-mozfilepicker.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozfilepicker.cpp 2008-03-11 11:20:54 UTC (rev 3472)
+++ kazehakase/trunk/module/embed/gecko/kz-mozfilepicker.cpp 2008-03-11 11:40:19 UTC (rev 3473)
@@ -105,22 +105,14 @@
////////////////////////////////////////////////////////////////////////////////
/* void init (in nsIDOMWindowInternal parent, in wstring title, in short mode); */
-#ifdef MOZ_NSIFILEPICKER_NSASTRING_
NS_IMETHODIMP KzFilePicker::Init(nsIDOMWindow *aParent,
const nsAString &aTitle,
PRInt16 aMode)
-#else
-NS_IMETHODIMP KzFilePicker::Init(nsIDOMWindowInternal *aParent,
- const PRUnichar *aTitle, PRInt16 aMode)
-#endif
{
mParent = do_QueryInterface(aParent);
mParentWidget = GetGtkWindowForDOMWindow(mParent);
-#ifdef MOZ_NSIFILEPICKER_NSASTRING_
+
NS_UTF16ToCString(aTitle, NS_CSTRING_ENCODING_UTF8, mTitle);
-#else
- NS_UTF16ToCString(nsEmbedString(aTitle), NS_CSTRING_ENCODING_UTF8, mTitle);
-#endif
mMode = aMode;
return NS_OK;
@@ -136,22 +128,13 @@
}
/* void appendFilter (in wstring title, in wstring filter); */
-#ifdef MOZ_NSIFILEPICKER_NSASTRING_
NS_IMETHODIMP KzFilePicker::AppendFilter(const nsAString &aTitle,
const nsAString &aFilter)
-#else
-NS_IMETHODIMP KzFilePicker::AppendFilter(const PRUnichar *aTitle,
- const PRUnichar *aFilter)
-#endif
{
//GtkFileSelection is crippled, so we can't provide a short-list
//of filters to choose from. We provide minimal functionality
//by using the most recent AppendFilter call as the active filter.
-#ifdef MOZ_NSIFILEPICKER_NSASTRING_
NS_UTF16ToCString(aFilter, NS_CSTRING_ENCODING_UTF8, mFilter);
-#else
- NS_UTF16ToCString(nsEmbedString(aFilter), NS_CSTRING_ENCODING_UTF8, mFilter);
-#endif
return NS_OK;
}
@@ -166,24 +149,12 @@
}
/* attribute wstring defaultString; */
-#ifdef MOZ_NSIFILEPICKER_NSASTRING_
NS_IMETHODIMP KzFilePicker::GetDefaultString(nsAString &aDefaultString)
-#else
-NS_IMETHODIMP KzFilePicker::GetDefaultString(PRUnichar * *aDefaultString)
-#endif
{
-#ifdef MOZ_NSIFILEPICKER_NSASTRING_
aDefaultString = mDefaultString;
-#else
- *aDefaultString = NS_StringCloneData(mDefaultString);
-#endif
return NS_OK;
}
-#ifdef MOZ_NSIFILEPICKER_NSASTRING_
NS_IMETHODIMP KzFilePicker::SetDefaultString(const nsAString &aDefaultString)
-#else
-NS_IMETHODIMP KzFilePicker::SetDefaultString(const PRUnichar *aDefaultString)
-#endif
{
mDefaultString.Assign(aDefaultString);
@@ -193,19 +164,12 @@
/* attribute wstring defaultExtension; */
// Again, due to the crippled file selector, we can't really
// do anything here.
-#ifdef MOZ_NSIFILEPICKER_NSASTRING_
NS_IMETHODIMP KzFilePicker::GetDefaultExtension(nsAString &aDefaultExtension)
-#else
-NS_IMETHODIMP KzFilePicker::GetDefaultExtension(PRUnichar * *aDefaultExtension)
-#endif
{
return NS_ERROR_NOT_IMPLEMENTED;
}
-#ifdef MOZ_NSIFILEPICKER_NSASTRING_
+
NS_IMETHODIMP KzFilePicker::SetDefaultExtension(const nsAString &aDefaultExtension)
-#else
-NS_IMETHODIMP KzFilePicker::SetDefaultExtension(const PRUnichar *aDefaultExtension)
-#endif
{
return NS_OK;
}
Modified: kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp 2008-03-11 11:20:54 UTC (rev 3472)
+++ kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp 2008-03-11 11:40:19 UTC (rev 3473)
@@ -47,9 +47,6 @@
KzContentHandler::KzContentHandler() :
mUri(nsnull),
-#ifndef MOZ_NSIMIMEINFO_NSACSTRING_
- mMimeType(nsnull),
-#endif
mDownloadCanceled(PR_FALSE)
{
NS_INIT_ISUPPORTS();
@@ -57,9 +54,6 @@
KzContentHandler::~KzContentHandler()
{
-#ifndef MOZ_NSIMIMEINFO_NSACSTRING_
- nsMemory::Free (mMimeType);
-#endif
}
@@ -119,18 +113,11 @@
NS_CStringToUTF16(cTitle,
NS_CSTRING_ENCODING_UTF8, title);
-#ifdef MOZ_NSIFILEPICKER_NSASTRING_
filePicker->Init(windowInternal,
title,
nsIFilePicker::modeSave);
nsEmbedString defaultFile(aDefaultFile);
filePicker->SetDefaultString(defaultFile);
-#else
- filePicker->Init(windowInternal,
- title.get(),
- nsIFilePicker::modeSave);
- filePicker->SetDefaultString(aDefaultFile);
-#endif
filePicker->SetDisplayDirectory(saveDir);
filePicker->Show(&okToSave);
@@ -159,11 +146,8 @@
nsCOMPtr<nsIMIMEInfo> MIMEInfo;
rv = mLauncher->GetMIMEInfo(getter_AddRefs(MIMEInfo));
-#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
+
rv = MIMEInfo->GetMIMEType(mMimeType);
-#else
- rv = MIMEInfo->GetMIMEType(&mMimeType);
-#endif
rv = mLauncher->GetSource(getter_AddRefs(mUri));
rv = mLauncher->GetTargetFile(getter_AddRefs(mTempFile));
Modified: kazehakase/trunk/module/embed/gecko/kz-mozlauncher.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozlauncher.h 2008-03-11 11:20:54 UTC (rev 3472)
+++ kazehakase/trunk/module/embed/gecko/kz-mozlauncher.h 2008-03-11 11:40:19 UTC (rev 3473)
@@ -69,11 +69,7 @@
nsCOMPtr<nsIURI> mUri;
nsCOMPtr<nsIFile> mTempFile;
-#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
nsEmbedCString mMimeType;
-#else
- char *mMimeType;
-#endif
PRBool mUrlHelper;
nsEmbedCString mUrl;
Modified: kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-03-11 11:20:54 UTC (rev 3472)
+++ kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-03-11 11:40:19 UTC (rev 3473)
@@ -1287,18 +1287,11 @@
cacheSession->SetDoomEntriesIfExpired(PR_FALSE);
nsCOMPtr<nsICacheEntryDescriptor> cacheEntryDescriptor;
-#ifdef MOZ_NSICACHESESSION_NSACSTRING_
+
rv = cacheSession->OpenCacheEntry(aKey,
nsICache::ACCESS_READ,
nsICache::NON_BLOCKING,
aCacheEntryDescriptor);
-#else
- nsEmbedCString cKey(aKey);
- rv = cacheSession->OpenCacheEntry(cKey.get(),
- nsICache::ACCESS_READ,
- nsICache::NON_BLOCKING,
- aCacheEntryDescriptor);
-#endif
if (NS_FAILED(rv) || !aCacheEntryDescriptor)
{
@@ -1309,18 +1302,10 @@
if(NS_FAILED(rv) || !cacheSession) return NS_ERROR_FAILURE;
cacheSession->SetDoomEntriesIfExpired (PR_FALSE);
-#ifdef MOZ_NSICACHESESSION_NSACSTRING_
return cacheSession->OpenCacheEntry(aKey,
nsICache::ACCESS_READ,
nsICache::NON_BLOCKING,
aCacheEntryDescriptor);
-#else
- nsEmbedCString cKey(aKey);
- return cacheSession->OpenCacheEntry(cKey.get(),
- nsICache::ACCESS_READ,
- nsICache::NON_BLOCKING,
- aCacheEntryDescriptor);
-#endif
}
return NS_OK;