aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rwxr-xr-xlib/egg/egg-editable-toolbar.c12
-rwxr-xr-xlib/egg/egg-toolbar-editor.c12
-rwxr-xr-xlib/egg/egg-toolbars-model.c2
-rw-r--r--lib/ephy-dialog.c2
-rw-r--r--lib/ephy-file-chooser.c2
-rw-r--r--lib/ephy-loader.c2
-rw-r--r--lib/ephy-module.c2
-rw-r--r--lib/ephy-node-db.c16
-rw-r--r--lib/ephy-node-filter.c12
-rw-r--r--lib/ephy-shlib-loader.c2
-rw-r--r--lib/widgets/ephy-location-entry.c12
-rw-r--r--lib/widgets/ephy-node-view.c12
-rw-r--r--lib/widgets/ephy-search-entry.c12
-rw-r--r--lib/widgets/ephy-spinner.c4
-rw-r--r--lib/widgets/ephy-tree-model-node.c14
-rw-r--r--lib/widgets/ephy-tree-model-sort.c14
-rw-r--r--lib/widgets/ephy-zoom-action.c2
-rw-r--r--lib/widgets/ephy-zoom-control.c2
18 files changed, 69 insertions, 67 deletions
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 02791ee86..0e7bc7d5e 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -90,9 +90,9 @@ struct EggEditableToolbarPrivate
GType
egg_editable_toolbar_get_type (void)
{
- static GType egg_editable_toolbar_type = 0;
+ static GType type = 0;
- if (egg_editable_toolbar_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info = {
sizeof (EggEditableToolbarClass),
@@ -106,12 +106,12 @@ egg_editable_toolbar_get_type (void)
(GInstanceInitFunc) egg_editable_toolbar_init
};
- egg_editable_toolbar_type = g_type_register_static (GTK_TYPE_VBOX,
- "EggEditableToolbar",
- &our_info, 0);
+ type = g_type_register_static (GTK_TYPE_VBOX,
+ "EggEditableToolbar",
+ &our_info, 0);
}
- return egg_editable_toolbar_type;
+ return type;
}
static int
diff --git a/lib/egg/egg-toolbar-editor.c b/lib/egg/egg-toolbar-editor.c
index f3ba1e94d..0187188ff 100755
--- a/lib/egg/egg-toolbar-editor.c
+++ b/lib/egg/egg-toolbar-editor.c
@@ -75,9 +75,9 @@ struct EggToolbarEditorPrivate
GType
egg_toolbar_editor_get_type (void)
{
- static GType egg_toolbar_editor_type = 0;
+ static GType type = 0;
- if (egg_toolbar_editor_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info = {
sizeof (EggToolbarEditorClass),
@@ -91,12 +91,12 @@ egg_toolbar_editor_get_type (void)
(GInstanceInitFunc) egg_toolbar_editor_init
};
- egg_toolbar_editor_type = g_type_register_static (GTK_TYPE_VBOX,
- "EggToolbarEditor",
- &our_info, 0);
+ type = g_type_register_static (GTK_TYPE_VBOX,
+ "EggToolbarEditor",
+ &our_info, 0);
}
- return egg_toolbar_editor_type;
+ return type;
}
static gint
diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c
index 8da9908cd..0d91878e7 100755
--- a/lib/egg/egg-toolbars-model.c
+++ b/lib/egg/egg-toolbars-model.c
@@ -77,7 +77,7 @@ egg_toolbars_model_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info = {
sizeof (EggToolbarsModelClass),
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index 234680c4b..60136c082 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -112,7 +112,7 @@ ephy_dialog_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c
index 156937509..fc0fcf7fa 100644
--- a/lib/ephy-file-chooser.c
+++ b/lib/ephy-file-chooser.c
@@ -56,7 +56,7 @@ ephy_file_chooser_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/lib/ephy-loader.c b/lib/ephy-loader.c
index cbd19fce9..d4b1a0375 100644
--- a/lib/ephy-loader.c
+++ b/lib/ephy-loader.c
@@ -30,7 +30,7 @@ ephy_loader_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/lib/ephy-module.c b/lib/ephy-module.c
index 60c96f1f2..95f9a587e 100644
--- a/lib/ephy-module.c
+++ b/lib/ephy-module.c
@@ -58,7 +58,7 @@ ephy_module_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo type_info =
{
diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c
index 0eaf92755..27e27073b 100644
--- a/lib/ephy-node-db.c
+++ b/lib/ephy-node-db.c
@@ -67,10 +67,12 @@ static GObjectClass *parent_class = NULL;
GType
ephy_node_db_get_type (void)
{
- static GType ephy_node_db_type = 0;
+ static GType type = 0;
- if (ephy_node_db_type == 0) {
- static const GTypeInfo our_info = {
+ if (G_UNLIKELY (type == 0))
+ {
+ static const GTypeInfo our_info =
+ {
sizeof (EphyNodeDbClass),
NULL,
NULL,
@@ -82,12 +84,12 @@ ephy_node_db_get_type (void)
(GInstanceInitFunc) ephy_node_db_init
};
- ephy_node_db_type = g_type_register_static (G_TYPE_OBJECT,
- "EphyNodeDb",
- &our_info, 0);
+ type = g_type_register_static (G_TYPE_OBJECT,
+ "EphyNodeDb",
+ &our_info, 0);
}
- return ephy_node_db_type;
+ return type;
}
static void
diff --git a/lib/ephy-node-filter.c b/lib/ephy-node-filter.c
index 229f99ad7..fd270b636 100644
--- a/lib/ephy-node-filter.c
+++ b/lib/ephy-node-filter.c
@@ -81,9 +81,9 @@ static guint ephy_node_filter_signals[LAST_SIGNAL] = { 0 };
GType
ephy_node_filter_get_type (void)
{
- static GType ephy_node_filter_type = 0;
+ static GType type = 0;
- if (ephy_node_filter_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -98,12 +98,12 @@ ephy_node_filter_get_type (void)
(GInstanceInitFunc) ephy_node_filter_init
};
- ephy_node_filter_type = g_type_register_static (G_TYPE_OBJECT,
- "EphyNodeFilter",
- &our_info, 0);
+ type = g_type_register_static (G_TYPE_OBJECT,
+ "EphyNodeFilter",
+ &our_info, 0);
}
- return ephy_node_filter_type;
+ return type;
}
static void
diff --git a/lib/ephy-shlib-loader.c b/lib/ephy-shlib-loader.c
index 68276bb67..8c6db15b0 100644
--- a/lib/ephy-shlib-loader.c
+++ b/lib/ephy-shlib-loader.c
@@ -58,7 +58,7 @@ ephy_shlib_loader_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 08d591bf7..2ff40840d 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -93,9 +93,9 @@ enum
GType
ephy_location_entry_get_type (void)
{
- static GType ephy_location_entry_type = 0;
+ static GType type = 0;
- if (ephy_location_entry_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -110,12 +110,12 @@ ephy_location_entry_get_type (void)
(GInstanceInitFunc) ephy_location_entry_init
};
- ephy_location_entry_type = g_type_register_static (GTK_TYPE_TOOL_ITEM,
- "EphyLocationEntry",
- &our_info, 0);
+ type = g_type_register_static (GTK_TYPE_TOOL_ITEM,
+ "EphyLocationEntry",
+ &our_info, 0);
}
- return ephy_location_entry_type;
+ return type;
}
static gboolean
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index e71b648b0..a67709e9b 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -111,9 +111,9 @@ static guint ephy_node_view_signals[LAST_SIGNAL] = { 0 };
GType
ephy_node_view_get_type (void)
{
- static GType ephy_node_view_type = 0;
+ static GType type = 0;
- if (ephy_node_view_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -128,12 +128,12 @@ ephy_node_view_get_type (void)
(GInstanceInitFunc) ephy_node_view_init
};
- ephy_node_view_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
- "EphyNodeView",
- &our_info, 0);
+ type = g_type_register_static (GTK_TYPE_TREE_VIEW,
+ "EphyNodeView",
+ &our_info, 0);
}
- return ephy_node_view_type;
+ return type;
}
static void
diff --git a/lib/widgets/ephy-search-entry.c b/lib/widgets/ephy-search-entry.c
index 2d0318774..bb84a323c 100644
--- a/lib/widgets/ephy-search-entry.c
+++ b/lib/widgets/ephy-search-entry.c
@@ -53,9 +53,9 @@ static guint ephy_search_entry_signals[LAST_SIGNAL] = { 0 };
GType
ephy_search_entry_get_type (void)
{
- static GType ephy_search_entry_type = 0;
+ static GType type = 0;
- if (ephy_search_entry_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -70,12 +70,12 @@ ephy_search_entry_get_type (void)
(GInstanceInitFunc) ephy_search_entry_init
};
- ephy_search_entry_type = g_type_register_static (GTK_TYPE_ENTRY,
- "EphySearchEntry",
- &our_info, 0);
+ type = g_type_register_static (GTK_TYPE_ENTRY,
+ "EphySearchEntry",
+ &our_info, 0);
}
- return ephy_search_entry_type;
+ return type;
}
static void
diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c
index d2b09bd37..ab98dc4cb 100644
--- a/lib/widgets/ephy-spinner.c
+++ b/lib/widgets/ephy-spinner.c
@@ -95,7 +95,7 @@ ephy_spinner_cache_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -474,7 +474,7 @@ ephy_spinner_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index 62377c664..60355eaf7 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -67,9 +67,9 @@ static GObjectClass *parent_class = NULL;
GType
ephy_tree_model_node_get_type (void)
{
- static GType ephy_tree_model_node_type = 0;
+ static GType type = 0;
- if (ephy_tree_model_node_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -91,16 +91,16 @@ ephy_tree_model_node_get_type (void)
NULL
};
- ephy_tree_model_node_type = g_type_register_static (G_TYPE_OBJECT,
- "EphyTreeModelNode",
- &our_info, 0);
+ type = g_type_register_static (G_TYPE_OBJECT,
+ "EphyTreeModelNode",
+ &our_info, 0);
- g_type_add_interface_static (ephy_tree_model_node_type,
+ g_type_add_interface_static (type,
GTK_TYPE_TREE_MODEL,
&tree_model_info);
}
- return ephy_tree_model_node_type;
+ return type;
}
static void
diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index 6803be38e..df5f9533c 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -58,9 +58,9 @@ static GObjectClass *parent_class = NULL;
GType
ephy_tree_model_sort_get_type (void)
{
- static GType ephy_tree_model_sort_type = 0;
+ static GType type = 0;
- if (ephy_tree_model_sort_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -81,16 +81,16 @@ ephy_tree_model_sort_get_type (void)
NULL
};
- ephy_tree_model_sort_type = g_type_register_static (GTK_TYPE_TREE_MODEL_SORT,
- "EphyTreeModelSort",
- &our_info, 0);
+ type = g_type_register_static (GTK_TYPE_TREE_MODEL_SORT,
+ "EphyTreeModelSort",
+ &our_info, 0);
- g_type_add_interface_static (ephy_tree_model_sort_type,
+ g_type_add_interface_static (type,
EGG_TYPE_TREE_MULTI_DRAG_SOURCE,
&multi_drag_source_info);
}
- return ephy_tree_model_sort_type;
+ return type;
}
static void
diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c
index 5a55f60b0..fcda19f2f 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)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/lib/widgets/ephy-zoom-control.c b/lib/widgets/ephy-zoom-control.c
index c9c3bfaff..15d7bcda3 100644
--- a/lib/widgets/ephy-zoom-control.c
+++ b/lib/widgets/ephy-zoom-control.c
@@ -65,7 +65,7 @@ ephy_zoom_control_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-06 09:23:49 +0800