[galeon] xulrunner-1.2 API sync
- From: Fabio Bonelli <fabiob src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [galeon] xulrunner-1.2 API sync
- Date: Sun, 2 May 2010 15:31:43 +0000 (UTC)
commit 79765e870bab478219ac2b62906e41b8235b0de0
Author: Fabio Bonelli <fabiob src gnome org>
Date: Sat May 1 21:14:11 2010 +0200
xulrunner-1.2 API sync
Patch galeon-2.0.7-moz192.patch from Fedora.
mozilla/EphyXULAppInfo.cpp | 9 +++++++++
mozilla/ExternalProtocolService.cpp | 9 +++++++++
2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/mozilla/EphyXULAppInfo.cpp b/mozilla/EphyXULAppInfo.cpp
index 1319431..299cbbf 100644
--- a/mozilla/EphyXULAppInfo.cpp
+++ b/mozilla/EphyXULAppInfo.cpp
@@ -128,3 +128,12 @@ EphyXULAppInfo::GetXPCOMABI(nsACString & aXPCOMABI)
aXPCOMABI.Assign (EPHY_HOST_CPU "-gcc3");
return NS_OK;
}
+
+/* readonly attribute AUTF8String WidgetToolkit; */
+NS_IMETHODIMP
+EphyXULAppInfo::GetWidgetToolkit(nsACString & aWidgetToolkit)
+{
+ aWidgetToolkit.Assign ("gtk");
+ return NS_OK;
+}
+
diff --git a/mozilla/ExternalProtocolService.cpp b/mozilla/ExternalProtocolService.cpp
index 4554998..85ba677 100644
--- a/mozilla/ExternalProtocolService.cpp
+++ b/mozilla/ExternalProtocolService.cpp
@@ -185,3 +185,12 @@ NS_IMETHODIMP GExternalProtocolService::GetProtocolHandlerInfo(const nsACString
return NS_ERROR_NOT_IMPLEMENTED;
}
#endif
+
+NS_IMETHODIMP GExternalProtocolService::GetProtocolHandlerInfoFromOS(const nsACString & aProtocolScheme, PRBool*, nsIHandlerInfo**)
+{
+ return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP GExternalProtocolService::SetProtocolHandlerDefaults(nsIHandlerInfo*, int)
+{
+ return NS_ERROR_NOT_IMPLEMENTED;
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]