aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/ContentHandler.cpp16
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/FilePicker.cpp36
3 files changed, 27 insertions, 27 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index f980c692c..8e46348fb 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -57,7 +57,7 @@ class GContentHandler;
NS_IMPL_ISUPPORTS1(GContentHandler, nsIHelperAppLauncherDialog)
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
GContentHandler::GContentHandler() : mMimeType(nsnull)
{
LOG ("GContentHandler ctor (%p)", this)
@@ -73,7 +73,7 @@ GContentHandler::~GContentHandler()
{
LOG ("GContentHandler dtor (%p)", this)
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
nsMemory::Free (mMimeType);
#endif
}
@@ -97,7 +97,7 @@ NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher,
NS_ENSURE_SUCCESS (rv, rv);
single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (embed_shell));
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
g_signal_emit_by_name (single, "handle_content", mMimeType,
mUrl.get(), &handled);
#else
@@ -226,7 +226,7 @@ NS_METHOD GContentHandler::Init (void)
mLauncher->GetMIMEInfo (getter_AddRefs(MIMEInfo));
NS_ENSURE_TRUE (MIMEInfo, NS_ERROR_FAILURE);
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
rv = MIMEInfo->GetMIMEType (&mMimeType);
#else
rv = MIMEInfo->GetMIMEType (mMimeType);
@@ -344,14 +344,14 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
auto_downloads = eel_gconf_get_boolean (CONF_AUTO_DOWNLOADS);
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
mHelperApp = gnome_vfs_mime_get_default_application (mMimeType);
#else
mHelperApp = gnome_vfs_mime_get_default_application (mMimeType.get());
#endif
CheckAppSupportScheme ();
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
mPermission = ephy_embed_shell_check_mime (embed_shell, mMimeType);
#else
mPermission = ephy_embed_shell_check_mime (embed_shell, mMimeType.get());
@@ -385,7 +385,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
/* HACK we use the application description to ask
MozDownload to open the file when download
is finished */
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
mimeInfo->SetApplicationDescription
(NS_LITERAL_STRING ("gnome-default").get());
#else
@@ -395,7 +395,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
}
else
{
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
mimeInfo->SetApplicationDescription (nsnull);
#else
mimeInfo->SetApplicationDescription (NS_LITERAL_STRING (""));
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 1ed969adf..25dda8900 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -220,7 +220,7 @@ EphyBrowser::GetListener (void)
nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface(domWindow));
NS_ENSURE_TRUE (piWin, NS_ERROR_FAILURE);
-#if MOZILLA_SNAPSHOT > 15
+#if MOZILLA_SNAPSHOT >= 18
nsIChromeEventHandler* chromeHandler;
chromeHandler = piWin->GetChromeEventHandler();
#else
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 540d58cae..80a0cbf3a 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -40,7 +40,7 @@
#include <nsReadableUtils.h>
#endif
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
#include <nsIDOMWindowInternal.h>
#endif
@@ -82,7 +82,7 @@ GFilePicker::~GFilePicker()
}
/* void init (in nsIDOMWindow parent, in AString title, in short mode); */
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *title, PRInt16 mode)
#else
NS_IMETHODIMP GFilePicker::Init(nsIDOMWindow *parent, const nsAString& title, PRInt16 mode)
@@ -97,7 +97,7 @@ NS_IMETHODIMP GFilePicker::Init(nsIDOMWindow *parent, const nsAString& title, PR
gtk_window_set_transient_for (GTK_WINDOW (mDialog), GTK_WINDOW (pwin));
}
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
gtk_window_set_title (GTK_WINDOW (mDialog), NS_ConvertUTF16toUTF8 (title).get());
#else
gtk_window_set_title (GTK_WINDOW (mDialog), NS_ConvertUCS2toUTF8(title).get());
@@ -163,7 +163,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
if (filterMask & nsIFilePicker::filterAll)
{
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
AppendFilter (NS_ConvertUTF8toUTF16 (_("All files")).get(),
NS_LITERAL_STRING ("*").get());
#else
@@ -173,7 +173,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
}
if (filterMask & nsIFilePicker::filterHTML)
{
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
AppendFilter (NS_ConvertUTF8toUTF16 (_("HTML files")).get(),
NS_LITERAL_STRING ("*.html; *.htm; *.shtml; *.xhtml").get());
#else
@@ -183,7 +183,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
}
if (filterMask & nsIFilePicker::filterText)
{
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
AppendFilter (NS_ConvertUTF8toUTF16 (_("Text files")).get(),
NS_LITERAL_STRING ("*.txt; *.text").get());
#else
@@ -193,7 +193,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
}
if (filterMask & nsIFilePicker::filterImages)
{
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
AppendFilter (NS_ConvertUTF8toUTF16 (_("Image files")).get(),
NS_LITERAL_STRING ("*.png; *.gif; *.jpeg; *.jpg").get());
#else
@@ -203,7 +203,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
}
if (filterMask & nsIFilePicker::filterXML)
{
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
AppendFilter (NS_ConvertUTF8toUTF16 (_("XML files")).get(),
NS_LITERAL_STRING ("*.xml").get());
#else
@@ -213,7 +213,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
}
if (filterMask & nsIFilePicker::filterXUL)
{
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
AppendFilter (NS_ConvertUTF8toUTF16 (_("XUL files")).get(),
NS_LITERAL_STRING ("*.xul").get());
#else
@@ -226,7 +226,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
}
/* void appendFilter (in AString title, in AString filter); */
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar *filter)
#else
NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString& title, const nsAString& filter)
@@ -272,7 +272,7 @@ NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString& title, const nsAString&
}
/* attribute AString defaultString; */
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar **aDefaultString)
#else
NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString)
@@ -287,7 +287,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString)
{
converted = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
*aDefaultString = ToNewUnicode (NS_ConvertUTF8toUTF16 (converted));
#else
aDefaultString = NS_ConvertUTF8toUTF16 (converted);
@@ -300,13 +300,13 @@ NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString)
return NS_OK;
}
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString)
#else
NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString)
#endif
{
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
LOG ("GFilePicker::SetDefaultString to %s",
NS_ConvertUTF16toUTF8 (aDefaultString).get())
#else
@@ -314,14 +314,14 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString)
NS_ConvertUCS2toUTF8 (aDefaultString).get())
#endif
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
if (aDefaultString)
#else
if (aDefaultString.Length())
#endif
{
/* set_current_name takes UTF-8, not a filename */
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
gtk_file_chooser_set_current_name
(GTK_FILE_CHOOSER (mDialog),
NS_ConvertUTF16toUTF8 (aDefaultString).get());
@@ -336,7 +336,7 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString)
}
/* attribute AString defaultExtension; */
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
NS_IMETHODIMP GFilePicker::GetDefaultExtension(PRUnichar **aDefaultExtension)
#else
NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension)
@@ -347,7 +347,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension)
return NS_ERROR_NOT_IMPLEMENTED;
}
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
NS_IMETHODIMP GFilePicker::SetDefaultExtension(const PRUnichar *aDefaultExtension)
#else
NS_IMETHODIMP GFilePicker::SetDefaultExtension(const nsAString& aDefaultExtension)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 08:28:49 +0800