aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/EphySingle.cpp22
-rw-r--r--embed/mozilla/mozilla-download.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-event.cpp4
-rw-r--r--embed/mozilla/mozilla-embed-find.cpp4
-rw-r--r--embed/mozilla/mozilla-embed-persist.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp12
-rw-r--r--embed/mozilla/mozilla-embed.cpp6
-rw-r--r--embed/mozilla/mozilla-x509-cert.cpp4
8 files changed, 28 insertions, 28 deletions
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index ec8eb0b84..d3a78bca9 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -148,20 +148,20 @@ EphySingle::EmitPermissionNotification (const char *name,
nsresult
EphySingle::ExamineCookies (nsISupports *aSubject)
{
- nsCOMPtr<nsIPropertyBag2> props = do_QueryInterface(aSubject);
- NS_ENSURE_TRUE (props, NS_ERROR_FAILURE);
-
PRBool isBlockingCookiesChannel = PR_FALSE;
- props->GetPropertyAsBool(
- NS_LITERAL_STRING("epiphany-blocking-cookies"),
- &isBlockingCookiesChannel);
- if (isBlockingCookiesChannel)
+
+ nsCOMPtr<nsIPropertyBag2> props (do_QueryInterface(aSubject));
+ if (props &&
+ NS_SUCCEEDED (props->GetPropertyAsBool(
+ NS_LITERAL_STRING("epiphany-blocking-cookies"),
+ &isBlockingCookiesChannel)) &&
+ isBlockingCookiesChannel)
{
- nsCOMPtr<nsIHttpChannel> channel = do_QueryInterface(aSubject);
- NS_ENSURE_TRUE (channel, NS_ERROR_FAILURE);
+ nsCOMPtr<nsIHttpChannel> httpChannel (do_QueryInterface(aSubject));
- channel->SetRequestHeader(NS_LITERAL_CSTRING("Cookie"),
- EmptyCString(), PR_FALSE);
+ if (httpChannel)
+ httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Cookie"),
+ EmptyCString(), PR_FALSE);
}
return NS_OK;
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index b2507b407..6c3034174 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -60,7 +60,7 @@ mozilla_download_get_type (void)
if (G_UNLIKELY (type == 0))
{
- static const GTypeInfo our_info =
+ const GTypeInfo our_info =
{
sizeof (MozillaDownloadClass),
NULL, /* base_init */
diff --git a/embed/mozilla/mozilla-embed-event.cpp b/embed/mozilla/mozilla-embed-event.cpp
index 4dc255014..da29b0046 100644
--- a/embed/mozilla/mozilla-embed-event.cpp
+++ b/embed/mozilla/mozilla-embed-event.cpp
@@ -52,7 +52,7 @@ mozilla_embed_event_get_type (void)
if (G_UNLIKELY (type == 0))
{
- static const GTypeInfo our_info =
+ const GTypeInfo our_info =
{
sizeof (MozillaEmbedEventClass),
NULL, /* base_init */
@@ -65,7 +65,7 @@ mozilla_embed_event_get_type (void)
(GInstanceInitFunc) mozilla_embed_event_init
};
- static const GInterfaceInfo embed_event_info =
+ const GInterfaceInfo embed_event_info =
{
(GInterfaceInitFunc) ephy_embed_event_iface_init,
NULL,
diff --git a/embed/mozilla/mozilla-embed-find.cpp b/embed/mozilla/mozilla-embed-find.cpp
index 75192ee36..e9b65ef6c 100644
--- a/embed/mozilla/mozilla-embed-find.cpp
+++ b/embed/mozilla/mozilla-embed-find.cpp
@@ -164,7 +164,7 @@ mozilla_embed_find_get_type (void)
if (G_UNLIKELY (type == 0))
{
- static const GTypeInfo our_info =
+ const GTypeInfo our_info =
{
sizeof (MozillaEmbedFindClass),
NULL, /* base_init */
@@ -177,7 +177,7 @@ mozilla_embed_find_get_type (void)
(GInstanceInitFunc) mozilla_embed_find_init
};
- static const GInterfaceInfo find_info =
+ const GInterfaceInfo find_info =
{
(GInterfaceInitFunc) ephy_find_iface_init,
NULL,
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index 22c6b9f9d..e02c5a1b1 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -80,7 +80,7 @@ mozilla_embed_persist_get_type (void)
if (G_UNLIKELY (type == 0))
{
- static const GTypeInfo our_info =
+ const GTypeInfo our_info =
{
sizeof (MozillaEmbedPersistClass),
NULL, /* base_init */
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 3d23a6b46..935ca80df 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -143,7 +143,7 @@ mozilla_embed_single_get_type (void)
if (G_UNLIKELY (type == 0))
{
- static const GTypeInfo our_info =
+ const GTypeInfo our_info =
{
sizeof (MozillaEmbedSingleClass),
NULL, /* base_init */
@@ -156,28 +156,28 @@ mozilla_embed_single_get_type (void)
(GInstanceInitFunc) mozilla_embed_single_init
};
- static const GInterfaceInfo embed_single_info =
+ const GInterfaceInfo embed_single_info =
{
(GInterfaceInitFunc) ephy_embed_single_iface_init,
NULL,
NULL
};
- static const GInterfaceInfo cookie_manager_info =
+ const GInterfaceInfo cookie_manager_info =
{
(GInterfaceInitFunc) ephy_cookie_manager_iface_init,
NULL,
NULL
};
- static const GInterfaceInfo password_manager_info =
+ const GInterfaceInfo password_manager_info =
{
(GInterfaceInitFunc) ephy_password_manager_iface_init,
NULL,
NULL
};
- static const GInterfaceInfo permission_manager_info =
+ const GInterfaceInfo permission_manager_info =
{
(GInterfaceInitFunc) ephy_permission_manager_iface_init,
NULL,
@@ -185,7 +185,7 @@ mozilla_embed_single_get_type (void)
};
#ifdef ENABLE_CERTIFICATE_MANAGER
- static const GInterfaceInfo certificate_manager_info =
+ const GInterfaceInfo certificate_manager_info =
{
(GInterfaceInitFunc) ephy_certificate_manager_iface_init,
NULL,
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 9ed487302..ffa174f0b 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -134,7 +134,7 @@ mozilla_embed_get_type (void)
if (G_UNLIKELY (type == 0))
{
- static const GTypeInfo our_info =
+ const GTypeInfo our_info =
{
sizeof (MozillaEmbedClass),
NULL, /* base_init */
@@ -147,14 +147,14 @@ mozilla_embed_get_type (void)
(GInstanceInitFunc) mozilla_embed_init
};
- static const GInterfaceInfo embed_info =
+ const GInterfaceInfo embed_info =
{
(GInterfaceInitFunc) ephy_embed_iface_init,
NULL,
NULL
};
- static const GInterfaceInfo ephy_command_manager_info =
+ const GInterfaceInfo ephy_command_manager_info =
{
(GInterfaceInitFunc) ephy_command_manager_iface_init,
NULL,
diff --git a/embed/mozilla/mozilla-x509-cert.cpp b/embed/mozilla/mozilla-x509-cert.cpp
index 51c79a209..065f68a79 100644
--- a/embed/mozilla/mozilla-x509-cert.cpp
+++ b/embed/mozilla/mozilla-x509-cert.cpp
@@ -56,7 +56,7 @@ mozilla_x509_cert_get_type (void)
if (mozilla_x509_cert_type == 0)
{
- static const GTypeInfo our_info =
+ const GTypeInfo our_info =
{
sizeof (MozillaX509CertClass),
NULL, /* base_init */
@@ -69,7 +69,7 @@ mozilla_x509_cert_get_type (void)
(GInstanceInitFunc) mozilla_x509_cert_init
};
- static const GInterfaceInfo x509_cert_info =
+ const GInterfaceInfo x509_cert_info =
{
(GInterfaceInitFunc) ephy_x509_cert_init, /* interface_init */
NULL, /* interface_finalize */
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 02:49:03 +0800