Add snapshot level for mozilla 1.7.6, and adapt to mozilla API change.

2005-03-25  Christian Persch  <chpe@cvs.gnome.org>

	* configure.in:
	* embed/mozilla/FilePicker.cpp:

	Add snapshot level for mozilla 1.7.6, and adapt to mozilla API change.

3 files changed, 23 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 28359e770..5de1233fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-25  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.in:
+	* embed/mozilla/FilePicker.cpp:
+
+	Add snapshot level for mozilla 1.7.6, and adapt to mozilla API change.
+
 2004-11-14  Christian Persch  <chpe@cvs.gnome.org>
 
 	=== Release 1.2.10 ===
diff --git a/configure.in b/configure.in
index 30187b7a3..818e8d866 100644
--- a/configure.in
+++ b/configure.in
@@ -46,7 +46,6 @@ AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_CC_STDC
 AC_HEADER_STDC
-AC_PROG_INTLTOOL
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 AC_SUBST(AM_CXXFLAGS)
@@ -208,7 +207,8 @@ case "$MOZILLA_VERSION" in
 1.7.3) MOZILLA_SNAPSHOT=17 ;;
 1.7.4) MOZILLA_SNAPSHOT=18 ;;
 1.7.5) MOZILLA_SNAPSHOT=18 ;;
-branch1.7) MOZILLA_SNAPSHOT=18 ;;
+1.7.6) MOZILLA_SNAPSHOT=19 ;;
+branch1.7) MOZILLA_SNAPSHOT=19 ;;
 trunk) MOZILLA_SNAPSHOT=21 ;;
     *) AC_ERROR([
 *****************************************************************************
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 1650ebe0c..c5381dbfa 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -38,7 +38,7 @@
 #include <nsString.h>
 #include <nsReadableUtils.h>
 
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 #include <nsIDOMWindowInternal.h>
 #endif
 
@@ -80,7 +80,7 @@ GFilePicker::~GFilePicker()
 }
 
 /* void init (in nsIDOMWindow parent, in AString title, in short mode); */
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *title, PRInt16 mode)
 #else
 NS_IMETHODIMP GFilePicker::Init(nsIDOMWindow *parent, const nsAString& title, PRInt16 mode)
@@ -161,7 +161,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 
 	if (filterMask & nsIFilePicker::filterAll)
 	{
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("All files")).get(),
 			      NS_LITERAL_STRING ("*").get());
 #else
@@ -171,7 +171,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 	}
 	if (filterMask & nsIFilePicker::filterHTML)
 	{
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("HTML files")).get(),
 			      NS_LITERAL_STRING ("*.html; *.htm; *.shtml; *.xhtml").get());
 #else
@@ -181,7 +181,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 	}
 	if (filterMask & nsIFilePicker::filterText)
 	{
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("Text files")).get(),
 			      NS_LITERAL_STRING ("*.txt; *.text").get());
 #else
@@ -191,7 +191,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 	}
 	if (filterMask & nsIFilePicker::filterImages)
 	{
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("Image files")).get(),
 			      NS_LITERAL_STRING ("*.png; *.gif; *.jpeg; *.jpg").get());
 #else
@@ -201,7 +201,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 	}
 	if (filterMask & nsIFilePicker::filterXML)
 	{
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("XML files")).get(),
 			      NS_LITERAL_STRING ("*.xml").get());
 #else
@@ -211,7 +211,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 	}
 	if (filterMask & nsIFilePicker::filterXUL)
 	{
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("XUL files")).get(),
 			      NS_LITERAL_STRING ("*.xul").get());
 #else
@@ -224,7 +224,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 }
 
 /* void appendFilter (in AString title, in AString filter); */
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar *filter)
 #else
 NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString& title, const nsAString& filter)
@@ -264,7 +264,7 @@ NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString& title, const nsAString&
 }
 
 /* attribute AString defaultString; */
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar **aDefaultString)
 #else
 NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString)
@@ -272,7 +272,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString)
 {
 	LOG ("GFilePicker::GetDefaultString")
 
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 	*aDefaultString = ToNewUnicode (mDefaultString);
 #else
 	aDefaultString = mDefaultString;
@@ -281,7 +281,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString)
 	return NS_OK;
 }
 
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString)
 #else
 NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString)
@@ -310,7 +310,7 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString)
 }
 
 /* attribute AString defaultExtension; */
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 NS_IMETHODIMP GFilePicker::GetDefaultExtension(PRUnichar **aDefaultExtension)
 #else
 NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension)
@@ -321,7 +321,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension)
 	return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-#if MOZILLA_SNAPSHOT < 20
+#if MOZILLA_SNAPSHOT < 19
 NS_IMETHODIMP GFilePicker::SetDefaultExtension(const PRUnichar *aDefaultExtension)
 #else
 NS_IMETHODIMP GFilePicker::SetDefaultExtension(const nsAString& aDefaultExtension)