Remove some unnecessary static data.

2006-09-06 Christian Persch  <chpe@cvs.gnome.org>

	* *.c *.cpp:

	Remove some unnecessary static data.

27 files changed, 47 insertions, 47 deletions

diff --git a/embed/Makefile.am b/embed/Makefile.am
index c1a44e282..a0bdeb3f3 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -110,7 +110,7 @@ stamp-ephy-embed-type-builtins.c: $(INST_H_FILES)
 		--fhead "#include \"ephy-embed-type-builtins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--fprod "\n#include \"@filename@\"" \
-		--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
+		--vhead "const G@Type@Value _@enum_name@_values[] = {" \
 		--vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
 		--vtail "  { 0, NULL, NULL }\n};\n\n" \
 		--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 28c3893aa..ff5d0668f 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -137,7 +137,7 @@ downloader_view_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (DownloaderViewClass),
 			NULL, /* base_init */
diff --git a/embed/ephy-certificate-manager.c b/embed/ephy-certificate-manager.c
index da75077cc..e91a545af 100644
--- a/embed/ephy-certificate-manager.c
+++ b/embed/ephy-certificate-manager.c
@@ -30,7 +30,7 @@ ephy_certificate_manager_get_type (void)
 
 	if (ephy_certificate_manager_type == 0)
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyCertificateManagerIface),
 			NULL,
diff --git a/embed/ephy-command-manager.c b/embed/ephy-command-manager.c
index a164500b4..f9cfe96bf 100644
--- a/embed/ephy-command-manager.c
+++ b/embed/ephy-command-manager.c
@@ -32,7 +32,7 @@ ephy_command_manager_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyCommandManagerIface),
 			ephy_command_manager_base_init,
diff --git a/embed/ephy-cookie-manager.c b/embed/ephy-cookie-manager.c
index 807b6091f..bf8464cb4 100644
--- a/embed/ephy-cookie-manager.c
+++ b/embed/ephy-cookie-manager.c
@@ -103,7 +103,7 @@ ephy_cookie_manager_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyCookieManagerIface),
 			ephy_cookie_manager_base_init,
diff --git a/embed/ephy-download.c b/embed/ephy-download.c
index a04d70eb6..92c9e038d 100644
--- a/embed/ephy-download.c
+++ b/embed/ephy-download.c
@@ -56,7 +56,7 @@ ephy_download_get_type (void)
 
         if (G_UNLIKELY (type == 0))
         {
-                static const GTypeInfo our_info =
+                const GTypeInfo our_info =
                 {
                         sizeof (EphyDownloadClass),
                         NULL, /* base_init */
diff --git a/embed/ephy-embed-dialog.c b/embed/ephy-embed-dialog.c
index 3677f891c..d747ad761 100644
--- a/embed/ephy-embed-dialog.c
+++ b/embed/ephy-embed-dialog.c
@@ -61,7 +61,7 @@ ephy_embed_dialog_get_type (void)
 
         if (G_UNLIKELY (type == 0))
         {
-                static const GTypeInfo our_info =
+                const GTypeInfo our_info =
                 {
                         sizeof (EphyEmbedDialogClass),
                         NULL, /* base_init */
diff --git a/embed/ephy-embed-event.c b/embed/ephy-embed-event.c
index 069a839d7..de8a07104 100644
--- a/embed/ephy-embed-event.c
+++ b/embed/ephy-embed-event.c
@@ -35,7 +35,7 @@ ephy_embed_event_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyEmbedEventIface),
 			ephy_embed_event_base_init,
diff --git a/embed/ephy-embed-find.c b/embed/ephy-embed-find.c
index 7fd05d51a..91a7fcf49 100644
--- a/embed/ephy-embed-find.c
+++ b/embed/ephy-embed-find.c
@@ -110,7 +110,7 @@ ephy_embed_find_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyEmbedFindIface),
 			NULL,
diff --git a/embed/ephy-embed-persist.c b/embed/ephy-embed-persist.c
index 5f9a6096d..25eeb6e96 100644
--- a/embed/ephy-embed-persist.c
+++ b/embed/ephy-embed-persist.c
@@ -70,7 +70,7 @@ ephy_embed_persist_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyEmbedPersistClass),
 			NULL, /* base_init */
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index b15b96c23..7c3333586 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -77,7 +77,7 @@ ephy_embed_shell_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyEmbedShellClass),
 			NULL, /* base_init */
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 3cd07570c..5302a186b 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -34,7 +34,7 @@ ephy_embed_single_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyEmbedSingleIface),
 			ephy_embed_single_iface_init,
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 7c6a5bf52..3010af448 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -36,7 +36,7 @@ ephy_embed_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyEmbedIface),
 			ephy_embed_base_init,
diff --git a/embed/ephy-encodings.c b/embed/ephy-encodings.c
index 27d700b79..7bb10a108 100644
--- a/embed/ephy-encodings.c
+++ b/embed/ephy-encodings.c
@@ -195,7 +195,7 @@ ephy_encodings_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyEncodingsClass),
 			NULL,
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index 6c063bfbd..6698a05fb 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -125,7 +125,7 @@ ephy_favicon_cache_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyFaviconCacheClass),
 			NULL,
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index 7b542be76..e8d5e4ffc 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -98,7 +98,7 @@ ephy_history_get_type (void)
 
         if (G_UNLIKELY (type == 0))
         {
-                static const GTypeInfo our_info =
+                const GTypeInfo our_info =
                 {
                         sizeof (EphyHistoryClass),
                         NULL, /* base_init */
diff --git a/embed/ephy-password-manager.c b/embed/ephy-password-manager.c
index e54bfb343..a4f1a5b93 100644
--- a/embed/ephy-password-manager.c
+++ b/embed/ephy-password-manager.c
@@ -113,7 +113,7 @@ ephy_password_manager_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyPasswordManagerIface),
 			ephy_password_manager_base_init,
diff --git a/embed/ephy-permission-manager.c b/embed/ephy-permission-manager.c
index 6dd8bfdc4..e4e704ac8 100644
--- a/embed/ephy-permission-manager.c
+++ b/embed/ephy-permission-manager.c
@@ -108,7 +108,7 @@ ephy_permission_manager_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 		sizeof (EphyPermissionManagerIface),
 		ephy_permission_manager_base_init,
diff --git a/embed/ephy-x509-cert.c b/embed/ephy-x509-cert.c
index 824d3d807..f35560e9d 100644
--- a/embed/ephy-x509-cert.c
+++ b/embed/ephy-x509-cert.c
@@ -30,7 +30,7 @@ ephy_x509_cert_get_type (void)
 
 	if (ephy_x509_cert_type == 0)
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyX509CertIface),
 			NULL,
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 */