svnno****@sourc*****
svnno****@sourc*****
Fri Feb 29 08:20:35 JST 2008
Revision: 3412
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3412
Author: ikezoe
Date: 2008-02-29 08:20:34 +0900 (Fri, 29 Feb 2008)
Log Message:
-----------
2008-02-29 Hiroyuki Ikezoe <poinc****@ikezo*****>
* macro/gecko.m4, module/embed/gecko/kz-mozfilepicker.cpp: Check
the argument of nsIFilePicker::GetFileURL().
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/macros/gecko.m4
kazehakase/trunk/module/embed/gecko/kz-mozfilepicker.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-02-28 13:56:39 UTC (rev 3411)
+++ kazehakase/trunk/ChangeLog 2008-02-28 23:20:34 UTC (rev 3412)
@@ -1,3 +1,8 @@
+2008-02-29 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * macro/gecko.m4, module/embed/gecko/kz-mozfilepicker.cpp: Check
+ the argument of nsIFilePicker::GetFileURL().
+
2008-02-28 Shunichi Fuji <palgl****@gmail*****>
* modules/search/kz-hyper-estraier-search.c:
Modified: kazehakase/trunk/macros/gecko.m4
===================================================================
--- kazehakase/trunk/macros/gecko.m4 2008-02-28 13:56:39 UTC (rev 3411)
+++ kazehakase/trunk/macros/gecko.m4 2008-02-28 23:20:34 UTC (rev 3412)
@@ -110,6 +110,20 @@
AC_MSG_RESULT([$result])
+AC_MSG_CHECKING([whether nsIFilePicker::GetFileURL methods expect nsIFileURL**])
+
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <nsIFilePicker.h>]],
+ [[nsIFilePicker *p;
+ nsIFileURL *u;
+ p->GetFileURL (&u);]]
+ )],
+ [AC_DEFINE([MOZ_NSIFILEPICKER_GETFILEURL_NSIFILEURL_],[1],[Define if nsIFilePicker::GetFileURL expects nsIFileURL**]) result=yes],
+ [result=no])
+
+AC_MSG_RESULT([$result])
+
dnl Changed from char* to nsAString& in 1.8a1
AC_MSG_CHECKING([whether nsIMIMEInfo methods expect nsAString&])
Modified: kazehakase/trunk/module/embed/gecko/kz-mozfilepicker.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozfilepicker.cpp 2008-02-28 13:56:39 UTC (rev 3411)
+++ kazehakase/trunk/module/embed/gecko/kz-mozfilepicker.cpp 2008-02-28 23:20:34 UTC (rev 3412)
@@ -231,12 +231,16 @@
}
/* readonly attribute nsIFileURL fileURL; */
-NS_IMETHODIMP KzFilePicker::GetFileURL(nsIFileURL * *aFileURL)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
+NS_IMETHODIMP KzFilePicker::GetFileURL(nsIFileURL * *aURI)
+#else
+NS_IMETHODIMP KzFilePicker::GetFileURL(nsIURI * *aURI)
+#endif
{
nsCOMPtr<nsIFileURL> fileURL =
do_CreateInstance(NS_STANDARDURL_CONTRACTID);
fileURL->SetFile(mFile);
- NS_IF_ADDREF(*aFileURL = fileURL);
+ NS_IF_ADDREF(*aURI = fileURL);
return NS_OK;
}