diff options
Diffstat (limited to 'src/bookmarks')
-rw-r--r-- | src/bookmarks/ephy-bookmark-action.c | 2 | ||||
-rw-r--r-- | src/bookmarks/ephy-bookmark-properties.c | 12 | ||||
-rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 12 | ||||
-rw-r--r-- | src/bookmarks/ephy-bookmarks-menu.c | 2 | ||||
-rw-r--r-- | src/bookmarks/ephy-bookmarks.c | 2 | ||||
-rwxr-xr-x | src/bookmarks/ephy-bookmarksbar-model.c | 2 | ||||
-rw-r--r-- | src/bookmarks/ephy-bookmarksbar.c | 2 | ||||
-rw-r--r-- | src/bookmarks/ephy-favorites-menu.c | 12 | ||||
-rw-r--r-- | src/bookmarks/ephy-new-bookmark.c | 12 | ||||
-rw-r--r-- | src/bookmarks/ephy-topic-action.c | 2 | ||||
-rw-r--r-- | src/bookmarks/ephy-topics-selector.c | 2 |
11 files changed, 31 insertions, 31 deletions
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c index 6a3f2dc02..5cc97b949 100644 --- a/src/bookmarks/ephy-bookmark-action.c +++ b/src/bookmarks/ephy-bookmark-action.c @@ -94,7 +94,7 @@ ephy_bookmark_action_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo type_info = { diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c index 65ef5044b..d95f2412b 100644 --- a/src/bookmarks/ephy-bookmark-properties.c +++ b/src/bookmarks/ephy-bookmark-properties.c @@ -79,9 +79,9 @@ static GObjectClass *parent_class = NULL; GType ephy_bookmark_properties_get_type (void) { - static GType ephy_bookmark_properties_type = 0; + static GType type = 0; - if (ephy_bookmark_properties_type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { @@ -96,12 +96,12 @@ ephy_bookmark_properties_get_type (void) (GInstanceInitFunc) ephy_bookmark_properties_init }; - ephy_bookmark_properties_type = g_type_register_static (GTK_TYPE_DIALOG, - "EphyBookmarkProperties", - &our_info, 0); + type = g_type_register_static (GTK_TYPE_DIALOG, + "EphyBookmarkProperties", + &our_info, 0); } - return ephy_bookmark_properties_type; + return type; } static void diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index c447cb65b..be69f1dfd 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -849,9 +849,9 @@ cmd_view_columns (GtkAction *action, GType ephy_bookmarks_editor_get_type (void) { - static GType ephy_bookmarks_editor_type = 0; + static GType type = 0; - if (ephy_bookmarks_editor_type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { @@ -866,12 +866,12 @@ ephy_bookmarks_editor_get_type (void) (GInstanceInitFunc) ephy_bookmarks_editor_init }; - ephy_bookmarks_editor_type = g_type_register_static (GTK_TYPE_WINDOW, - "EphyBookmarksEditor", - &our_info, 0); + type = g_type_register_static (GTK_TYPE_WINDOW, + "EphyBookmarksEditor", + &our_info, 0); } - return ephy_bookmarks_editor_type; + return type; } static void diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c index 62adeb395..ee76e5f98 100644 --- a/src/bookmarks/ephy-bookmarks-menu.c +++ b/src/bookmarks/ephy-bookmarks-menu.c @@ -88,7 +88,7 @@ ephy_bookmarks_menu_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index ff351272d..2e6c0ca9a 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -122,7 +122,7 @@ ephy_bookmarks_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/bookmarks/ephy-bookmarksbar-model.c b/src/bookmarks/ephy-bookmarksbar-model.c index 0bbcad7c5..abe7dd16f 100755 --- a/src/bookmarks/ephy-bookmarksbar-model.c +++ b/src/bookmarks/ephy-bookmarksbar-model.c @@ -70,7 +70,7 @@ ephy_bookmarksbar_model_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { sizeof (EphyBookmarksBarModelClass), diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c index 519244ecb..91026bd71 100644 --- a/src/bookmarks/ephy-bookmarksbar.c +++ b/src/bookmarks/ephy-bookmarksbar.c @@ -74,7 +74,7 @@ ephy_bookmarksbar_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/bookmarks/ephy-favorites-menu.c b/src/bookmarks/ephy-favorites-menu.c index 7a30f46a0..6dedfde1b 100644 --- a/src/bookmarks/ephy-favorites-menu.c +++ b/src/bookmarks/ephy-favorites-menu.c @@ -57,9 +57,9 @@ static gpointer parent_class; GType ephy_favorites_menu_get_type (void) { - static GType ephy_favorites_menu_type = 0; + static GType type = 0; - if (ephy_favorites_menu_type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { @@ -74,11 +74,11 @@ ephy_favorites_menu_get_type (void) (GInstanceInitFunc) ephy_favorites_menu_init }; - ephy_favorites_menu_type = g_type_register_static (G_TYPE_OBJECT, - "EphyFavoritesMenu", - &our_info, 0); + type = g_type_register_static (G_TYPE_OBJECT, + "EphyFavoritesMenu", + &our_info, 0); } - return ephy_favorites_menu_type; + return type; } static void diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c index 142a2505d..9592f686e 100644 --- a/src/bookmarks/ephy-new-bookmark.c +++ b/src/bookmarks/ephy-new-bookmark.c @@ -83,9 +83,9 @@ static GObjectClass *parent_class = NULL; GType ephy_new_bookmark_get_type (void) { - static GType ephy_new_bookmark_type = 0; + static GType type = 0; - if (ephy_new_bookmark_type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { @@ -100,12 +100,12 @@ ephy_new_bookmark_get_type (void) (GInstanceInitFunc) ephy_new_bookmark_init }; - ephy_new_bookmark_type = g_type_register_static (GTK_TYPE_DIALOG, - "EphyNewBookmark", - &our_info, 0); + type = g_type_register_static (GTK_TYPE_DIALOG, + "EphyNewBookmark", + &our_info, 0); } - return ephy_new_bookmark_type; + return type; } static void diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c index 601bd11f8..c002377f5 100644 --- a/src/bookmarks/ephy-topic-action.c +++ b/src/bookmarks/ephy-topic-action.c @@ -84,7 +84,7 @@ ephy_topic_action_get_type (void) { static GType type = 0; - if (!type) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo type_info = { diff --git a/src/bookmarks/ephy-topics-selector.c b/src/bookmarks/ephy-topics-selector.c index 561fd9799..01aca9a41 100644 --- a/src/bookmarks/ephy-topics-selector.c +++ b/src/bookmarks/ephy-topics-selector.c @@ -54,7 +54,7 @@ ephy_topics_selector_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { |