diff options
Diffstat (limited to 'src')
33 files changed, 90 insertions, 90 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 = { diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c index 6b839aaed..6a0966ba6 100644 --- a/src/ephy-completion-model.c +++ b/src/ephy-completion-model.c @@ -51,9 +51,9 @@ static GObjectClass *parent_class = NULL; GType ephy_completion_model_get_type (void) { - static GType ephy_completion_model_type = 0; + static GType type = 0; - if (ephy_completion_model_type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { @@ -75,16 +75,16 @@ ephy_completion_model_get_type (void) NULL }; - ephy_completion_model_type = g_type_register_static (G_TYPE_OBJECT, - "EphyCompletionModel", - &our_info, 0); + type = g_type_register_static (G_TYPE_OBJECT, + "EphyCompletionModel", + &our_info, 0); - g_type_add_interface_static (ephy_completion_model_type, + g_type_add_interface_static (type, GTK_TYPE_TREE_MODEL, &tree_model_info); } - return ephy_completion_model_type; + return type; } static void diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c index 3f6cae00b..dbc43262a 100644 --- a/src/ephy-encoding-dialog.c +++ b/src/ephy-encoding-dialog.c @@ -86,7 +86,7 @@ ephy_encoding_dialog_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c index dc2197278..e2a10a014 100644 --- a/src/ephy-encoding-menu.c +++ b/src/ephy-encoding-menu.c @@ -70,9 +70,9 @@ static GObjectClass *parent_class = NULL; GType ephy_encoding_menu_get_type (void) { - static GType ephy_encoding_menu_type = 0; + static GType type = 0; - if (ephy_encoding_menu_type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { @@ -87,12 +87,12 @@ ephy_encoding_menu_get_type (void) (GInstanceInitFunc) ephy_encoding_menu_init }; - ephy_encoding_menu_type = g_type_register_static (G_TYPE_OBJECT, - "EphyEncodingMenu", - &our_info, 0); + type = g_type_register_static (G_TYPE_OBJECT, + "EphyEncodingMenu", + &our_info, 0); } - return ephy_encoding_menu_type; + return type; } static void diff --git a/src/ephy-extension.c b/src/ephy-extension.c index 144104eee..15f27d5cf 100644 --- a/src/ephy-extension.c +++ b/src/ephy-extension.c @@ -30,7 +30,7 @@ ephy_extension_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c index c68d90dde..f39283abe 100644 --- a/src/ephy-extensions-manager.c +++ b/src/ephy-extensions-manager.c @@ -103,7 +103,7 @@ ephy_extensions_manager_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/ephy-favicon-action.c b/src/ephy-favicon-action.c index 1952fd6f7..0951b1ede 100644 --- a/src/ephy-favicon-action.c +++ b/src/ephy-favicon-action.c @@ -71,7 +71,7 @@ ephy_favicon_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/ephy-go-action.c b/src/ephy-go-action.c index 449b85367..74fc2fdb5 100644 --- a/src/ephy-go-action.c +++ b/src/ephy-go-action.c @@ -39,7 +39,7 @@ ephy_go_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/ephy-history-window.c b/src/ephy-history-window.c index cdf89af1a..bfcb06a50 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -598,9 +598,9 @@ cmd_view_columns (GtkAction *action, GType ephy_history_window_get_type (void) { - static GType ephy_history_window_type = 0; + static GType type = 0; - if (ephy_history_window_type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { @@ -615,12 +615,12 @@ ephy_history_window_get_type (void) (GInstanceInitFunc) ephy_history_window_init }; - ephy_history_window_type = g_type_register_static (GTK_TYPE_WINDOW, - "EphyHistoryWindow", - &our_info, 0); + type = g_type_register_static (GTK_TYPE_WINDOW, + "EphyHistoryWindow", + &our_info, 0); } - return ephy_history_window_type; + return type; } static void diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c index ef7c31eb8..bfb3440bf 100644 --- a/src/ephy-location-action.c +++ b/src/ephy-location-action.c @@ -74,7 +74,7 @@ ephy_location_action_get_type (void) { static GType type = 0; - if (!type) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo type_info = { @@ -93,6 +93,7 @@ ephy_location_action_get_type (void) "EphyLocationAction", &type_info, 0); } + return type; } diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c index 77ac1acbb..c49e4b78b 100644 --- a/src/ephy-navigation-action.c +++ b/src/ephy-navigation-action.c @@ -68,7 +68,7 @@ ephy_navigation_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/ephy-notebook.c b/src/ephy-notebook.c index 049eda9ab..f3f39011c 100644 --- a/src/ephy-notebook.c +++ b/src/ephy-notebook.c @@ -106,9 +106,9 @@ static GObjectClass *parent_class = NULL; GType ephy_notebook_get_type (void) { - static GType ephy_notebook_type = 0; + static GType type = 0; - if (ephy_notebook_type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { @@ -123,12 +123,12 @@ ephy_notebook_get_type (void) (GInstanceInitFunc) ephy_notebook_init }; - ephy_notebook_type = g_type_register_static (GTK_TYPE_NOTEBOOK, - "EphyNotebook", - &our_info, 0); + type = g_type_register_static (GTK_TYPE_NOTEBOOK, + "EphyNotebook", + &our_info, 0); } - return ephy_notebook_type; + return type; } static void diff --git a/src/ephy-session.c b/src/ephy-session.c index c82dccb96..468aae087 100644 --- a/src/ephy-session.c +++ b/src/ephy-session.c @@ -80,7 +80,7 @@ ephy_session_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 1e049bb3b..9703ac719 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -101,7 +101,7 @@ ephy_shell_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/ephy-statusbar.c b/src/ephy-statusbar.c index 697af416d..033a1d28c 100755 --- a/src/ephy-statusbar.c +++ b/src/ephy-statusbar.c @@ -59,7 +59,7 @@ ephy_statusbar_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/ephy-tab.c b/src/ephy-tab.c index 6095d526a..aba0f8f40 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -148,9 +148,9 @@ static void ephy_tab_set_popups_allowed (EphyTab *tab, GType ephy_tab_get_type (void) { - static GType ephy_tab_type = 0; + static GType type = 0; - if (ephy_tab_type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { @@ -165,12 +165,12 @@ ephy_tab_get_type (void) (GInstanceInitFunc) ephy_tab_init }; - ephy_tab_type = g_type_register_static (GTK_TYPE_BIN, - "EphyTab", - &our_info, 0); + type = g_type_register_static (GTK_TYPE_BIN, + "EphyTab", + &our_info, 0); } - return ephy_tab_type; + return type; } static void diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c index 6d59d2ba8..d59ecfc45 100644 --- a/src/ephy-tabs-menu.c +++ b/src/ephy-tabs-menu.c @@ -62,9 +62,9 @@ enum GType ephy_tabs_menu_get_type (void) { - static GType ephy_tabs_menu_type = 0; + static GType type = 0; - if (ephy_tabs_menu_type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { @@ -79,12 +79,12 @@ ephy_tabs_menu_get_type (void) (GInstanceInitFunc) ephy_tabs_menu_init }; - ephy_tabs_menu_type = g_type_register_static (G_TYPE_OBJECT, - "EphyTabsMenu", - &our_info, 0); + type = g_type_register_static (G_TYPE_OBJECT, + "EphyTabsMenu", + &our_info, 0); } - return ephy_tabs_menu_type; + return type; } static void diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c index 96cecdc6f..48561fc2d 100755 --- a/src/ephy-toolbars-model.c +++ b/src/ephy-toolbars-model.c @@ -50,7 +50,7 @@ ephy_toolbars_model_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { sizeof (EphyToolbarsModelClass), diff --git a/src/ephy-window.c b/src/ephy-window.c index e3733c1a4..4bf2f37e9 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -388,7 +388,7 @@ ephy_window_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index 7a45aabbe..1432c637e 100755 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -145,7 +145,7 @@ pdm_dialog_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c index 31cb156b6..219e163b1 100755 --- a/src/ppview-toolbar.c +++ b/src/ppview-toolbar.c @@ -126,7 +126,7 @@ ppview_toolbar_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index e5e8004e0..56f1369c7 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -345,7 +345,7 @@ prefs_dialog_get_type (void) { static GType type = 0; - if (type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { diff --git a/src/toolbar.c b/src/toolbar.c index 60e003a11..67f7edb4f 100755 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -81,9 +81,9 @@ struct ToolbarPrivate GType toolbar_get_type (void) { - static GType toolbar_type = 0; + static GType type = 0; - if (toolbar_type == 0) + if (G_UNLIKELY (type == 0)) { static const GTypeInfo our_info = { @@ -98,13 +98,12 @@ toolbar_get_type (void) (GInstanceInitFunc) toolbar_init }; - toolbar_type = g_type_register_static (EGG_TYPE_EDITABLE_TOOLBAR, - "Toolbar", - &our_info, 0); + type = g_type_register_static (EGG_TYPE_EDITABLE_TOOLBAR, + "Toolbar", + &our_info, 0); } - return toolbar_type; - + return type; } static void |