Remove some unnecessary static data.

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

	* *.c *.cpp:

	Remove some unnecessary static data.

45 files changed, 59 insertions, 59 deletions

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 */