Remove some unnecessary static data.

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

	* *.c *.cpp:

	Remove some unnecessary static data.

98 files changed, 146 insertions, 134 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c335ba5a..19814c6f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-06 Christian Persch  <chpe@cvs.gnome.org>
+
+	* *.c *.cpp:
+
+	Remove some unnecessary static data.
+
 2006-09-03  Christian Persch  <chpe@cvs.gnome.org>
 
 	* configure.ac:
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index 859a652b9..aa5c6d64d 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -341,6 +341,12 @@ be done by casting).
 @:
 @: 
 @: 
+@:
+@: 
+@: 
+@:
+@: 
+@: 
 @: 
 
 <!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### -->
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 */
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 950bad27d..24aff4649 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -134,7 +134,7 @@ stamp-ephy-lib-type-builtins.c: $(TYPES_H_FILES)
 		--fhead "#include \"ephy-lib-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/lib/egg/Makefile.am b/lib/egg/Makefile.am
index bb50e0915..e4c63e8df 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -64,7 +64,7 @@ stamp-eggtypebuiltins.c: $(EGGHEADERS)
 		--fhead "#include \"eggtypebuiltins.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/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 104326fbf..6183bc8b0 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -109,7 +109,7 @@ egg_editable_toolbar_get_type (void)
 
   if (G_UNLIKELY (type == 0))
     {
-      static const GTypeInfo our_info = {
+      const GTypeInfo our_info = {
 	sizeof (EggEditableToolbarClass),
 	NULL,			/* base_init */
 	NULL,			/* base_finalize */
diff --git a/lib/egg/egg-toolbar-editor.c b/lib/egg/egg-toolbar-editor.c
index ca3e2f1ea..c52357668 100755
--- a/lib/egg/egg-toolbar-editor.c
+++ b/lib/egg/egg-toolbar-editor.c
@@ -78,7 +78,7 @@ egg_toolbar_editor_get_type (void)
 
   if (G_UNLIKELY (type == 0))
     {
-      static const GTypeInfo our_info = {
+      const GTypeInfo our_info = {
 	sizeof (EggToolbarEditorClass),
 	NULL,			/* base_init */
 	NULL,			/* base_finalize */
diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c
index f0a5b0fa0..2cd58ac69 100755
--- a/lib/egg/egg-toolbars-model.c
+++ b/lib/egg/egg-toolbars-model.c
@@ -75,7 +75,7 @@ egg_toolbars_model_get_type (void)
 
   if (G_UNLIKELY (type == 0))
     {
-      static const GTypeInfo our_info = {
+      const GTypeInfo our_info = {
 	sizeof (EggToolbarsModelClass),
 	NULL,			/* base_init */
 	NULL,			/* base_finalize */
diff --git a/lib/egg/eggtreemultidnd.c b/lib/egg/eggtreemultidnd.c
index 3a7da919c..4850c6860 100644
--- a/lib/egg/eggtreemultidnd.c
+++ b/lib/egg/eggtreemultidnd.c
@@ -59,7 +59,7 @@ egg_tree_multi_drag_source_get_type (void)
 
   if (!our_type)
     {
-      static const GTypeInfo our_info =
+      const GTypeInfo our_info =
       {
         sizeof (EggTreeMultiDragSourceIface), /* class_size */
 	NULL,		/* base_init */
diff --git a/lib/ephy-adblock.c b/lib/ephy-adblock.c
index 4307737df..2ba3e1e53 100644
--- a/lib/ephy-adblock.c
+++ b/lib/ephy-adblock.c
@@ -31,7 +31,7 @@ ephy_adblock_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyAdBlockIface),
 			NULL,
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index 669f6d5d8..52863ef5c 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -115,7 +115,7 @@ ephy_dialog_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyDialogClass),
 			NULL, /* base_init */
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c
index b240e0828..e0a483e50 100644
--- a/lib/ephy-file-chooser.c
+++ b/lib/ephy-file-chooser.c
@@ -57,7 +57,7 @@ ephy_file_chooser_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyFileChooserClass),
 			NULL,
diff --git a/lib/ephy-loader.c b/lib/ephy-loader.c
index d7df7de8c..13abec2b8 100644
--- a/lib/ephy-loader.c
+++ b/lib/ephy-loader.c
@@ -30,7 +30,7 @@ ephy_loader_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyLoaderIface),
 			NULL,
diff --git a/lib/ephy-module.c b/lib/ephy-module.c
index 8c9c977e4..d6188894f 100644
--- a/lib/ephy-module.c
+++ b/lib/ephy-module.c
@@ -59,7 +59,7 @@ ephy_module_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo type_info =
+		const GTypeInfo type_info =
 		{
 			sizeof (EphyModuleClass),
 			(GBaseInitFunc) NULL,
diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c
index daa54da13..05f904057 100644
--- a/lib/ephy-node-db.c
+++ b/lib/ephy-node-db.c
@@ -548,7 +548,7 @@ ephy_node_db_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyNodeDbClass),
 			NULL,
diff --git a/lib/ephy-node-filter.c b/lib/ephy-node-filter.c
index 0457f30ca..04314c6d6 100644
--- a/lib/ephy-node-filter.c
+++ b/lib/ephy-node-filter.c
@@ -83,7 +83,7 @@ ephy_node_filter_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyNodeFilterClass),
 			NULL,
diff --git a/lib/ephy-shlib-loader.c b/lib/ephy-shlib-loader.c
index c1a82e938..b4407d7ae 100644
--- a/lib/ephy-shlib-loader.c
+++ b/lib/ephy-shlib-loader.c
@@ -56,7 +56,7 @@ ephy_shlib_loader_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyShlibLoaderClass),
 			NULL, /* base_init */
@@ -69,7 +69,7 @@ ephy_shlib_loader_get_type (void)
 			(GInstanceInitFunc) ephy_shlib_loader_init
 		};
 
-		static const GInterfaceInfo loader_info =
+		const GInterfaceInfo loader_info =
 		{
 			(GInterfaceInitFunc) ephy_shlib_loader_iface_init,
 			NULL,
diff --git a/lib/ephy-spell-check.c b/lib/ephy-spell-check.c
index b11e585e3..c50607143 100755
--- a/lib/ephy-spell-check.c
+++ b/lib/ephy-spell-check.c
@@ -124,7 +124,7 @@ ephy_spell_check_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphySpellCheckClass),
 			NULL,
diff --git a/lib/widgets/ephy-icon-entry.c b/lib/widgets/ephy-icon-entry.c
index 1950819fb..d7c545341 100644
--- a/lib/widgets/ephy-icon-entry.c
+++ b/lib/widgets/ephy-icon-entry.c
@@ -292,7 +292,7 @@ ephy_icon_entry_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyIconEntryClass),
 			NULL,
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 939267839..a3da0fd28 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -135,7 +135,7 @@ ephy_location_entry_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyLocationEntryClass),
 			NULL,
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index fcbc34e18..0a6365ec3 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -112,7 +112,7 @@ ephy_node_view_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyNodeViewClass),
 			NULL,
diff --git a/lib/widgets/ephy-search-entry.c b/lib/widgets/ephy-search-entry.c
index a783f2ae3..facc0bda6 100644
--- a/lib/widgets/ephy-search-entry.c
+++ b/lib/widgets/ephy-search-entry.c
@@ -55,7 +55,7 @@ ephy_search_entry_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphySearchEntryClass),
 			NULL,
diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c
index 1371ea3dd..3bf36bc65 100644
--- a/lib/widgets/ephy-spinner.c
+++ b/lib/widgets/ephy-spinner.c
@@ -104,7 +104,7 @@ ephy_spinner_cache_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphySpinnerCacheClass),
 			NULL,
@@ -534,7 +534,7 @@ ephy_spinner_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphySpinnerClass),
 			NULL, /* base_init */
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index 0fb20594d..496620ab8 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -69,7 +69,7 @@ ephy_tree_model_node_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyTreeModelNodeClass),
 			NULL,
@@ -82,7 +82,7 @@ ephy_tree_model_node_get_type (void)
 			(GInstanceInitFunc) ephy_tree_model_node_init
 		};
 
-		static const GInterfaceInfo tree_model_info =
+		const GInterfaceInfo tree_model_info =
 		{
 			(GInterfaceInitFunc) ephy_tree_model_node_tree_model_init,
 			NULL,
diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index dc6af7982..a9cd26045 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -61,7 +61,7 @@ ephy_tree_model_sort_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyTreeModelSortClass),
 			NULL, /* base init */
@@ -73,7 +73,7 @@ ephy_tree_model_sort_get_type (void)
 			0, /* n_preallocs */
 			(GInstanceInitFunc) ephy_tree_model_sort_init
 		};
-		static const GInterfaceInfo multi_drag_source_info =
+		const GInterfaceInfo multi_drag_source_info =
 		{
 			(GInterfaceInitFunc) ephy_tree_model_sort_multi_drag_source_init,
 			NULL,
diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c
index 3334cf7a2..3f75ea0cd 100644
--- a/lib/widgets/ephy-zoom-action.c
+++ b/lib/widgets/ephy-zoom-action.c
@@ -66,7 +66,7 @@ ephy_zoom_action_get_type (void)
 
         if (G_UNLIKELY (type == 0))
         {
-                static const GTypeInfo our_info =
+                const GTypeInfo our_info =
 			{
 				sizeof (EphyZoomActionClass),
 				NULL, /* base_init */
diff --git a/lib/widgets/ephy-zoom-control.c b/lib/widgets/ephy-zoom-control.c
index 040a00dba..b4f282919 100644
--- a/lib/widgets/ephy-zoom-control.c
+++ b/lib/widgets/ephy-zoom-control.c
@@ -66,7 +66,7 @@ ephy_zoom_control_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 			{
 				sizeof (EphyZoomControlClass),
 				NULL, /* base_init */
diff --git a/src/Makefile.am b/src/Makefile.am
index e2abb81c0..b92ac5ec5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -267,7 +267,7 @@ stamp-ephy-type-builtins.c: $(INST_H_FILES) $(NOINST_H_FILES)
 		--fhead "#include \"ephy-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/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 43f22d152..218b5e0b1 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -69,7 +69,7 @@ stamp-ephy-bookmarks-type-builtins.c: $(INST_H_FILES) $(NOINST_H_FILES)
 		--fhead "#include \"ephy-bookmarks-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/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 455ee6c17..0de532183 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -725,7 +725,7 @@ ephy_bookmark_action_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo type_info =
+		const GTypeInfo type_info =
 		{
 			sizeof (EphyBookmarkActionClass),
 			(GBaseInitFunc) NULL,
diff --git a/src/bookmarks/ephy-bookmark-factory-action.c b/src/bookmarks/ephy-bookmark-factory-action.c
index 8d684afa1..d4faab6b7 100644
--- a/src/bookmarks/ephy-bookmark-factory-action.c
+++ b/src/bookmarks/ephy-bookmark-factory-action.c
@@ -45,7 +45,7 @@ ephy_bookmark_factory_action_get_type (void)
 
 	if (!type)
 	{
-		static const GTypeInfo type_info =
+		const GTypeInfo type_info =
 		{
 			sizeof (EphyBookmarkFactoryActionClass),
 			(GBaseInitFunc) NULL,
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 04b3bb4e1..59d4f020e 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -760,7 +760,7 @@ ephy_bookmark_properties_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyBookmarkPropertiesClass),
 			NULL,
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 00553bbac..326f68f35 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1183,7 +1183,7 @@ ephy_bookmarks_editor_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyBookmarksEditorClass),
 			NULL,
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 6d141bcc8..2ae082c6e 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -136,7 +136,7 @@ ephy_bookmarks_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyBookmarksClass),
 			NULL, /* base_init */
diff --git a/src/bookmarks/ephy-related-action.c b/src/bookmarks/ephy-related-action.c
index 3b83fba60..f69e0948c 100644
--- a/src/bookmarks/ephy-related-action.c
+++ b/src/bookmarks/ephy-related-action.c
@@ -128,7 +128,7 @@ ephy_related_action_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyRelatedActionClass),
 			NULL, /* base_init */
@@ -140,7 +140,7 @@ ephy_related_action_get_type (void)
 			0,   /* n_preallocs */
 			NULL /* instance_init */
 		};
-		static const GInterfaceInfo link_info = 
+		const GInterfaceInfo link_info = 
 		{
 			(GInterfaceInitFunc) iface_init,
 			NULL,
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 3923ef793..9b5f78b6a 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -562,7 +562,7 @@ ephy_topic_action_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo type_info =
+		const GTypeInfo type_info =
 		{
 			sizeof (EphyTopicActionClass),
 			(GBaseInitFunc) NULL,
diff --git a/src/bookmarks/ephy-topic-factory-action.c b/src/bookmarks/ephy-topic-factory-action.c
index 16f6d1732..735d2b6e2 100644
--- a/src/bookmarks/ephy-topic-factory-action.c
+++ b/src/bookmarks/ephy-topic-factory-action.c
@@ -46,7 +46,7 @@ ephy_topic_factory_action_get_type (void)
 
 	if (!type)
 	{
-		static const GTypeInfo type_info =
+		const GTypeInfo type_info =
 		{
 			sizeof (EphyTopicFactoryActionClass),
 			(GBaseInitFunc) NULL,
diff --git a/src/bookmarks/ephy-topics-entry.c b/src/bookmarks/ephy-topics-entry.c
index 2bb7e0f3f..73db715a4 100644
--- a/src/bookmarks/ephy-topics-entry.c
+++ b/src/bookmarks/ephy-topics-entry.c
@@ -71,7 +71,7 @@ ephy_topics_entry_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyTopicsEntryClass),
 			NULL,
diff --git a/src/bookmarks/ephy-topics-palette.c b/src/bookmarks/ephy-topics-palette.c
index 214a4c0e1..9cdb551f5 100644
--- a/src/bookmarks/ephy-topics-palette.c
+++ b/src/bookmarks/ephy-topics-palette.c
@@ -77,7 +77,7 @@ ephy_topics_palette_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyTopicsPaletteClass),
 			NULL,
diff --git a/src/ephy-cert-manager-dialog.c b/src/ephy-cert-manager-dialog.c
index ea8ef5c98..3ab534bfd 100644
--- a/src/ephy-cert-manager-dialog.c
+++ b/src/ephy-cert-manager-dialog.c
@@ -488,7 +488,7 @@ certs_manager_dialog_get_type (void)
 
 	if (certs_manager_dialog_type == 0)
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (CertsManagerDialogClass),
 			NULL, /* base_init */
diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c
index a78521c8c..f630aece0 100644
--- a/src/ephy-completion-model.c
+++ b/src/ephy-completion-model.c
@@ -53,7 +53,7 @@ ephy_completion_model_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyCompletionModelClass),
 			NULL,
@@ -66,7 +66,7 @@ ephy_completion_model_get_type (void)
 			(GInstanceInitFunc) ephy_completion_model_init
 		};
 
-		static const GInterfaceInfo tree_model_info =
+		const GInterfaceInfo tree_model_info =
 		{
 			(GInterfaceInitFunc) ephy_completion_model_tree_model_init,
 			NULL,
diff --git a/src/ephy-dbus.c b/src/ephy-dbus.c
index 1acd940a4..9deaf8130 100644
--- a/src/ephy-dbus.c
+++ b/src/ephy-dbus.c
@@ -455,7 +455,7 @@ ephy_dbus_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyDbusClass),
 			NULL, /* base_init */
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 79d1a7621..901a0f041 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -85,7 +85,7 @@ ephy_encoding_dialog_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyEncodingDialogClass),
 			NULL, /* base_init */
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 1d566cf67..8c5536771 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -71,7 +71,7 @@ ephy_encoding_menu_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyEncodingMenuClass),
 			NULL,
diff --git a/src/ephy-extension.c b/src/ephy-extension.c
index b4e92b891..52a3c8718 100644
--- a/src/ephy-extension.c
+++ b/src/ephy-extension.c
@@ -30,7 +30,7 @@ ephy_extension_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyExtensionIface),
 			NULL,
diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c
index a06152e01..7d3496d50 100644
--- a/src/ephy-extensions-manager.c
+++ b/src/ephy-extensions-manager.c
@@ -139,7 +139,7 @@ ephy_extensions_manager_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyExtensionsManagerClass),
 			NULL, /* base_init */
@@ -152,7 +152,7 @@ ephy_extensions_manager_get_type (void)
 			(GInstanceInitFunc) ephy_extensions_manager_init
 		};
 
-		static const GInterfaceInfo extension_info =
+		const GInterfaceInfo extension_info =
 		{
 			(GInterfaceInitFunc) ephy_extensions_manager_iface_init,
 			NULL,
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
index ab04e67bb..0e4dc1fc8 100644
--- a/src/ephy-find-toolbar.c
+++ b/src/ephy-find-toolbar.c
@@ -517,7 +517,7 @@ ephy_find_toolbar_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyFindToolbarClass),
 			NULL, /* base_init */
diff --git a/src/ephy-fullscreen-popup.c b/src/ephy-fullscreen-popup.c
index ea6679ecf..6ac802625 100644
--- a/src/ephy-fullscreen-popup.c
+++ b/src/ephy-fullscreen-popup.c
@@ -434,7 +434,7 @@ ephy_fullscreen_popup_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyFullscreenPopupClass),
 			NULL,
diff --git a/src/ephy-go-action.c b/src/ephy-go-action.c
index 347398183..eb7881030 100644
--- a/src/ephy-go-action.c
+++ b/src/ephy-go-action.c
@@ -39,7 +39,7 @@ ephy_go_action_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo type_info =
+		const GTypeInfo type_info =
 		{
 			sizeof (EphyGoActionClass),
 			(GBaseInitFunc) NULL,
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index bdd85c777..603af58cb 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -560,7 +560,7 @@ ephy_history_window_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyHistoryWindowClass),
 			NULL,
diff --git a/src/ephy-home-action.c b/src/ephy-home-action.c
index 7d2357bd3..4ccbe9a8a 100644
--- a/src/ephy-home-action.c
+++ b/src/ephy-home-action.c
@@ -56,7 +56,7 @@ ephy_home_action_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo type_info =
+		const GTypeInfo type_info =
 		{
 			sizeof (EphyHomeActionClass),
 			(GBaseInitFunc) NULL,
diff --git a/src/ephy-link-action.c b/src/ephy-link-action.c
index 3a3543221..5c5d5f96c 100644
--- a/src/ephy-link-action.c
+++ b/src/ephy-link-action.c
@@ -168,7 +168,7 @@ ephy_link_action_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyLinkActionClass),
 			NULL, /* base_init */
@@ -180,7 +180,7 @@ ephy_link_action_get_type (void)
 			0,   /* n_preallocs */
 			NULL /* instance_init */
 		};
-		static const GInterfaceInfo link_info = 
+		const GInterfaceInfo link_info = 
 		{
 			NULL,
 			NULL,
@@ -205,7 +205,7 @@ ephy_link_action_group_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyLinkActionGroupClass),
 			NULL, /* base_init */
@@ -217,7 +217,7 @@ ephy_link_action_group_get_type (void)
 			0,   /* n_preallocs */
 			NULL /* instance_init */
 		};
-		static const GInterfaceInfo link_info = 
+		const GInterfaceInfo link_info = 
 		{
 			NULL,
 			NULL,
diff --git a/src/ephy-link.c b/src/ephy-link.c
index 67be0e221..247a5a914 100644
--- a/src/ephy-link.c
+++ b/src/ephy-link.c
@@ -67,7 +67,7 @@ ephy_link_get_type (void)
 

 	if (G_UNLIKELY (type == 0))

 	{

-		static const GTypeInfo our_info =

+		const GTypeInfo our_info =

 		{

 			sizeof (EphyLinkIface),

 			ephy_link_base_init,

diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index 927c09396..c550d9c7f 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -91,7 +91,7 @@ ephy_location_action_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo type_info =
+		const GTypeInfo type_info =
 		{
 			sizeof (EphyLocationActionClass),
 			(GBaseInitFunc) NULL,
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index 046aff66c..142e83e10 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -316,7 +316,7 @@ ephy_lockdown_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyLockdownClass),
 			NULL, /* base_init */
@@ -328,7 +328,7 @@ ephy_lockdown_get_type (void)
 			0, /* n_preallocs */
 			(GInstanceInitFunc) ephy_lockdown_init
 		};
-		static const GInterfaceInfo extension_info =
+		const GInterfaceInfo extension_info =
 		{
 			(GInterfaceInitFunc) ephy_lockdown_iface_init,
 			NULL,
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index 670f06f47..94cee466c 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -74,7 +74,7 @@ ephy_navigation_action_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo type_info =
+		const GTypeInfo type_info =
 		{
 			sizeof (EphyNavigationActionClass),
 			(GBaseInitFunc) NULL,
diff --git a/src/ephy-net-monitor.c b/src/ephy-net-monitor.c
index 63c15ef0e..ef80b7da4 100644
--- a/src/ephy-net-monitor.c
+++ b/src/ephy-net-monitor.c
@@ -391,7 +391,7 @@ ephy_net_monitor_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyShellClass),
 			NULL, /* base_init */
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index a250836a5..409d8a7c3 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -109,7 +109,7 @@ ephy_notebook_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 			{
 				sizeof (EphyNotebookClass),
 				NULL, /* base_init */
@@ -122,7 +122,7 @@ ephy_notebook_get_type (void)
 				(GInstanceInitFunc) ephy_notebook_init
 			};
 
-		static const GInterfaceInfo link_info =
+		const GInterfaceInfo link_info =
 		{
 			NULL,
 			NULL,
diff --git a/src/ephy-python-extension.c b/src/ephy-python-extension.c
index 4d6e31c35..7ff5bcd6e 100644
--- a/src/ephy-python-extension.c
+++ b/src/ephy-python-extension.c
@@ -342,7 +342,7 @@ ephy_python_extension_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyPythonExtensionClass),
 			NULL, /* base_init */
@@ -354,7 +354,7 @@ ephy_python_extension_get_type (void)
 			0, /* n_preallocs */
 			(GInstanceInitFunc) ephy_python_extension_init
 		};
-		static const GInterfaceInfo extension_info =
+		const GInterfaceInfo extension_info =
 		{
 			(GInterfaceInitFunc) ephy_python_extension_iface_init,
 			NULL,
diff --git a/src/ephy-python-loader.c b/src/ephy-python-loader.c
index 1e0e697c8..129f31626 100644
--- a/src/ephy-python-loader.c
+++ b/src/ephy-python-loader.c
@@ -120,7 +120,7 @@ ephy_python_loader_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyPythonLoaderClass),
 			NULL, /* base_init */
@@ -132,7 +132,7 @@ ephy_python_loader_get_type (void)
 			0, /* n_preallocs */
 			(GInstanceInitFunc) ephy_python_loader_init
 		};
-		static const GInterfaceInfo loader_info =
+		const GInterfaceInfo loader_info =
 		{
 			(GInterfaceInitFunc) ephy_python_loader_iface_init,
 			NULL,
diff --git a/src/ephy-session.c b/src/ephy-session.c
index f3bd78430..dbf5cc2f6 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -104,7 +104,7 @@ ephy_session_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphySessionClass),
 			NULL, /* base_init */
@@ -117,7 +117,7 @@ ephy_session_get_type (void)
 			(GInstanceInitFunc) ephy_session_init
 		};
 
-		static const GInterfaceInfo extension_info =
+		const GInterfaceInfo extension_info =
 		{
 			(GInterfaceInitFunc) ephy_session_iface_init,
 			NULL,
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 81618503e..3d44e2928 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -96,7 +96,7 @@ ephy_shell_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyShellClass),
 			NULL, /* base_init */
diff --git a/src/ephy-statusbar.c b/src/ephy-statusbar.c
index c5dab348f..cbf6a651c 100755
--- a/src/ephy-statusbar.c
+++ b/src/ephy-statusbar.c
@@ -68,7 +68,7 @@ ephy_statusbar_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyStatusbarClass),
 			NULL, /* base_init */
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index b5f99a4ff..2f4902664 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -189,7 +189,7 @@ ephy_tab_get_type (void)
 
         if (G_UNLIKELY (type == 0))
         {
-                static const GTypeInfo our_info =
+                const GTypeInfo our_info =
                 {
                         sizeof (EphyTabClass),
                         NULL, /* base_init */
@@ -201,7 +201,7 @@ ephy_tab_get_type (void)
                         0, /* n_preallocs */
                         (GInstanceInitFunc) ephy_tab_init
                 };
-		static const GInterfaceInfo link_info = 
+		const GInterfaceInfo link_info = 
 		{
 			NULL,
 			NULL,
diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c
index 553f8c033..5a179d40a 100644
--- a/src/ephy-tabs-menu.c
+++ b/src/ephy-tabs-menu.c
@@ -72,7 +72,7 @@ ephy_tabs_menu_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyTabsMenuClass),
 			NULL, /* base_init */
diff --git a/src/ephy-toolbar-editor.c b/src/ephy-toolbar-editor.c
index da43d8f0e..9606cd387 100644
--- a/src/ephy-toolbar-editor.c
+++ b/src/ephy-toolbar-editor.c
@@ -378,7 +378,7 @@ ephy_toolbar_editor_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyToolbarEditorClass),
 			NULL,
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index 2524764bd..fceccb6f1 100755
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -703,7 +703,7 @@ ephy_toolbar_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyToolbarClass),
 			NULL, /* base_init */
@@ -715,7 +715,7 @@ ephy_toolbar_get_type (void)
 			0, /* n_preallocs */
 			(GInstanceInitFunc) ephy_toolbar_init
 		};
-		static const GInterfaceInfo link_info = 
+		const GInterfaceInfo link_info = 
 		{
 			NULL,
 			NULL,
diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c
index 103ebc4c6..5897a07b0 100755
--- a/src/ephy-toolbars-model.c
+++ b/src/ephy-toolbars-model.c
@@ -55,7 +55,7 @@ ephy_toolbars_model_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info = {
+		const GTypeInfo our_info = {
 		sizeof (EphyToolbarsModelClass),
 		NULL,			/* base_init */
 		NULL,			/* base_finalize */
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 21e4f7f7e..0ecb2d71f 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -491,7 +491,7 @@ ephy_window_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (EphyWindowClass),
 			NULL, /* base_init */
@@ -503,7 +503,7 @@ ephy_window_get_type (void)
 			0, /* n_preallocs */
 			(GInstanceInitFunc) ephy_window_init
 		};
-		static const GInterfaceInfo link_info = 
+		const GInterfaceInfo link_info = 
 		{
 			(GInterfaceInitFunc) ephy_window_link_iface_init,
 			NULL,
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index ecc198c96..cf36d3032 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -147,7 +147,7 @@ pdm_dialog_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (PdmDialogClass),
 			NULL, /* base_init */
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index f82f34960..6b6482f1d 100755
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -125,7 +125,7 @@ ppview_toolbar_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (PPViewToolbarClass),
 			NULL, /* base_init */
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 74d922cd5..6fb5bd099 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -300,7 +300,7 @@ prefs_dialog_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo our_info =
+		const GTypeInfo our_info =
 		{
 			sizeof (PrefsDialogClass),
 			NULL, /* base_init */