From 0e53172e606f1a8857061cad638bed51fbcc6fb1 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 23 Oct 2004 16:49:18 +0000 Subject: Annotate "if (type == 0)" in get_type functions with G_UNLIKELY, like the 2004-10-23 Christian Persch * embed/downloader-view.c: (downloader_view_get_type): * embed/ephy-command-manager.c: (ephy_command_manager_get_type): * embed/ephy-cookie-manager.c: (ephy_cookie_get_type), (ephy_cookie_manager_get_type): * embed/ephy-download.c: (ephy_download_get_type): * embed/ephy-embed-dialog.c: (ephy_embed_dialog_get_type): * embed/ephy-embed-event.c: (ephy_embed_event_get_type): * embed/ephy-embed-persist.c: (ephy_embed_persist_get_type): * embed/ephy-embed-shell.c: (ephy_embed_shell_get_type): * embed/ephy-embed-single.c: (ephy_embed_single_get_type): * embed/ephy-embed.c: (ephy_embed_get_type): * embed/ephy-encodings.c: (ephy_encodings_get_type): * embed/ephy-favicon-cache.c: (ephy_favicon_cache_get_type): * embed/ephy-history.c: (ephy_history_get_type): * embed/ephy-password-manager.c: (ephy_password_info_get_type), (ephy_password_manager_get_type): * embed/ephy-permission-manager.c: (ephy_permission_info_get_type), (ephy_permission_manager_get_type): * embed/find-dialog.c: (find_dialog_get_type): * embed/mozilla/mozilla-download.cpp: * embed/mozilla/mozilla-embed-event.cpp: * embed/mozilla/mozilla-embed-persist.cpp: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-embed.cpp: * lib/egg/egg-editable-toolbar.c: (egg_editable_toolbar_get_type): * lib/egg/egg-toolbar-editor.c: (egg_toolbar_editor_get_type): * lib/egg/egg-toolbars-model.c: (egg_toolbars_model_get_type): * lib/ephy-dialog.c: (ephy_dialog_get_type): * lib/ephy-file-chooser.c: (ephy_file_chooser_get_type): * lib/ephy-loader.c: (ephy_loader_get_type): * lib/ephy-module.c: (ephy_module_get_type): * lib/ephy-node-db.c: (ephy_node_db_get_type): * lib/ephy-node-filter.c: (ephy_node_filter_get_type): * lib/ephy-shlib-loader.c: (ephy_shlib_loader_get_type): * lib/widgets/ephy-location-entry.c: (ephy_location_entry_get_type): * lib/widgets/ephy-node-view.c: (ephy_node_view_get_type): * lib/widgets/ephy-search-entry.c: (ephy_search_entry_get_type): * lib/widgets/ephy-spinner.c: (ephy_spinner_cache_get_type), (ephy_spinner_get_type): * lib/widgets/ephy-tree-model-node.c: (ephy_tree_model_node_get_type): * lib/widgets/ephy-tree-model-sort.c: (ephy_tree_model_sort_get_type): * lib/widgets/ephy-zoom-action.c: (ephy_zoom_action_get_type): * lib/widgets/ephy-zoom-control.c: (ephy_zoom_control_get_type): * src/bookmarks/ephy-bookmark-action.c: (ephy_bookmark_action_get_type): * src/bookmarks/ephy-bookmark-properties.c: (ephy_bookmark_properties_get_type): * src/bookmarks/ephy-bookmarks-editor.c: (ephy_bookmarks_editor_get_type): * src/bookmarks/ephy-bookmarks-menu.c: (ephy_bookmarks_menu_get_type): * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_get_type): * src/bookmarks/ephy-bookmarksbar-model.c: (ephy_bookmarksbar_model_get_type): * src/bookmarks/ephy-bookmarksbar.c: (ephy_bookmarksbar_get_type): * src/bookmarks/ephy-favorites-menu.c: (ephy_favorites_menu_get_type): * src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_get_type): * src/bookmarks/ephy-topic-action.c: (ephy_topic_action_get_type): * src/bookmarks/ephy-topics-selector.c: (ephy_topics_selector_get_type): * src/ephy-completion-model.c: (ephy_completion_model_get_type): * src/ephy-encoding-dialog.c: (ephy_encoding_dialog_get_type): * src/ephy-encoding-menu.c: (ephy_encoding_menu_get_type): * src/ephy-extension.c: (ephy_extension_get_type): * src/ephy-extensions-manager.c: (ephy_extensions_manager_get_type): * src/ephy-favicon-action.c: (ephy_favicon_action_get_type): * src/ephy-go-action.c: (ephy_go_action_get_type): * src/ephy-history-window.c: (ephy_history_window_get_type): * src/ephy-location-action.c: (ephy_location_action_get_type): * src/ephy-navigation-action.c: (ephy_navigation_action_get_type): * src/ephy-notebook.c: (ephy_notebook_get_type): * src/ephy-session.c: (ephy_session_get_type): * src/ephy-shell.c: (ephy_shell_get_type): * src/ephy-statusbar.c: (ephy_statusbar_get_type): * src/ephy-tab.c: (ephy_tab_get_type): * src/ephy-tabs-menu.c: (ephy_tabs_menu_get_type): * src/ephy-toolbars-model.c: (ephy_toolbars_model_get_type): * src/ephy-window.c: (ephy_window_get_type): * src/pdm-dialog.c: (pdm_dialog_get_type): * src/ppview-toolbar.c: (ppview_toolbar_get_type): * src/prefs-dialog.c: (prefs_dialog_get_type): * src/toolbar.c: (toolbar_get_type): Annotate "if (type == 0)" in get_type functions with G_UNLIKELY, like the G_TYPE_DEFINE macros do. --- src/bookmarks/ephy-bookmark-action.c | 2 +- src/bookmarks/ephy-bookmark-properties.c | 12 ++++++------ src/bookmarks/ephy-bookmarks-editor.c | 12 ++++++------ src/bookmarks/ephy-bookmarks-menu.c | 2 +- src/bookmarks/ephy-bookmarks.c | 2 +- src/bookmarks/ephy-bookmarksbar-model.c | 2 +- src/bookmarks/ephy-bookmarksbar.c | 2 +- src/bookmarks/ephy-favorites-menu.c | 12 ++++++------ src/bookmarks/ephy-new-bookmark.c | 12 ++++++------ src/bookmarks/ephy-topic-action.c | 2 +- src/bookmarks/ephy-topics-selector.c | 2 +- 11 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src/bookmarks') 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 = { -- cgit v1.2.3