From 47fb87e520d1abe31a1965d500602e0e80e899b2 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Sun, 08 Oct 2006 12:35:42 +0000
Subject: Reduce relocations. Bug #360616.

2006-10-08  Christian Persch  <chpe@cvs.gnome.org>

	* backend/ev-async-renderer.c: (ev_async_renderer_get_type):
	* backend/ev-document-find.c: (ev_document_find_get_type):
	* backend/ev-document-fonts.c: (ev_document_fonts_get_type):
	* backend/ev-document-links.c: (ev_document_links_get_type):
	* backend/ev-document-security.c: (ev_document_security_get_type):
	* backend/ev-document-thumbnails.c:
	(ev_document_thumbnails_get_type):
	* backend/ev-document.c: (ev_document_get_type):
	* backend/ev-ps-exporter.c: (ev_ps_exporter_get_type):
	* backend/ev-selection.c: (ev_selection_get_type):
	* cut-n-paste/recent-files/egg-recent-model.c:
	(egg_recent_model_get_type):
	* cut-n-paste/recent-files/egg-recent-view-uimanager.c:
	(egg_recent_view_uimanager_get_type):
	* cut-n-paste/recent-files/egg-recent-view.c:
	(egg_recent_view_get_type):
	* cut-n-paste/toolbar-editor/egg-editable-toolbar.c:
	(egg_editable_toolbar_get_type):
	* cut-n-paste/toolbar-editor/egg-toolbar-editor.c:
	(egg_toolbar_editor_get_type):
	* cut-n-paste/toolbar-editor/egg-toolbars-model.c:
	(egg_toolbars_model_get_type):
	* cut-n-paste/toolbar-editor/eggtreemultidnd.c:
	(egg_tree_multi_drag_source_get_type):
	* cut-n-paste/zoom-control/ephy-zoom-action.c:
	(ephy_zoom_action_get_type):
	* cut-n-paste/zoom-control/ephy-zoom-control.c:
	(ephy_zoom_control_get_type):
	* impress/r_back.c: (_imp_fill_back):
	* properties/ev-properties-main.c:
	(ev_properties_plugin_register_type):
	* shell/ev-sidebar-page.c: (ev_sidebar_page_get_type):
	* shell/ev-view-accessible.c: (ev_view_accessible_get_type),
	(ev_view_accessible_factory_get_type):

	Reduce relocations. Bug #360616.
---
(limited to 'shell')

diff --git a/shell/ev-sidebar-page.c b/shell/ev-sidebar-page.c
index af45413..8e6a33d 100644
--- a/shell/ev-sidebar-page.c
+++ b/shell/ev-sidebar-page.c
@@ -34,7 +34,7 @@ ev_sidebar_page_get_type (void)
 
 	if (G_UNLIKELY (type == 0))
 	{
-		static const GTypeInfo sidebar_page_info =
+		const GTypeInfo sidebar_page_info =
 		{
 			sizeof (EvSidebarPageIface),
 			NULL,
diff --git a/shell/ev-view-accessible.c b/shell/ev-view-accessible.c
index 3d64bfc..27f887a 100644
--- a/shell/ev-view-accessible.c
+++ b/shell/ev-view-accessible.c
@@ -467,8 +467,8 @@ GType ev_view_accessible_get_type (void)
 {
 	static GType type = 0;
 
-	if (!type) {
-		static GTypeInfo tinfo = {
+	if (G_UNLIKELY (type == 0)) {
+		GTypeInfo tinfo = {
 			0,	/* class size */
 			(GBaseInitFunc) NULL,	/* base init */
 			(GBaseFinalizeFunc) NULL,	/* base finalize */
@@ -481,14 +481,14 @@ GType ev_view_accessible_get_type (void)
 			NULL	/* value table */
 		};
 
-		static const GInterfaceInfo atk_text_info = {
+		const GInterfaceInfo atk_text_info = {
 			(GInterfaceInitFunc)
 			    ev_view_accessible_text_iface_init,
 			(GInterfaceFinalizeFunc) NULL,
 			NULL
 		};
 
-		static const GInterfaceInfo atk_action_info = {
+		const GInterfaceInfo atk_action_info = {
 			(GInterfaceInitFunc)
 			    ev_view_accessible_action_iface_init,
 			(GInterfaceFinalizeFunc) NULL,
@@ -566,8 +566,8 @@ GType ev_view_accessible_factory_get_type (void)
 {
 	static GType type = 0;
 
-	if (!type) {
-		static const GTypeInfo tinfo = {
+	if (G_UNLIKELY (type == 0)) {
+		const GTypeInfo tinfo = {
 			sizeof(AtkObjectFactoryClass),
 			NULL,	/* base_init */
 			NULL,	/* base_finalize */
--
cgit v0.9.1