diff options
Diffstat (limited to 'lib/widgets')
| -rw-r--r-- | lib/widgets/ephy-location-entry.c | 12 | ||||
| -rw-r--r-- | lib/widgets/ephy-node-view.c | 12 | ||||
| -rw-r--r-- | lib/widgets/ephy-search-entry.c | 12 | ||||
| -rw-r--r-- | lib/widgets/ephy-spinner.c | 4 | ||||
| -rw-r--r-- | lib/widgets/ephy-tree-model-node.c | 14 | ||||
| -rw-r--r-- | lib/widgets/ephy-tree-model-sort.c | 14 | ||||
| -rw-r--r-- | lib/widgets/ephy-zoom-action.c | 2 | ||||
| -rw-r--r-- | lib/widgets/ephy-zoom-control.c | 2 |
8 files changed, 36 insertions, 36 deletions
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 = { |