aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/downloader-view.c12
-rw-r--r--embed/ephy-command-manager.c2
-rw-r--r--embed/ephy-cookie-manager.c4
-rw-r--r--embed/ephy-download.c12
-rw-r--r--embed/ephy-embed-dialog.c12
-rw-r--r--embed/ephy-embed-event.c2
-rw-r--r--embed/ephy-embed-persist.c2
-rw-r--r--embed/ephy-embed-shell.c2
-rw-r--r--embed/ephy-embed-single.c2
-rw-r--r--embed/ephy-embed.c13
-rw-r--r--embed/ephy-encodings.c12
-rw-r--r--embed/ephy-favicon-cache.c2
-rw-r--r--embed/ephy-history.c2
-rw-r--r--embed/ephy-password-manager.c4
-rw-r--r--embed/ephy-permission-manager.c4
-rwxr-xr-xembed/find-dialog.c12
-rw-r--r--embed/mozilla/mozilla-download.cpp22
-rw-r--r--embed/mozilla/mozilla-embed-event.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-persist.cpp13
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp2
-rw-r--r--embed/mozilla/mozilla-embed.cpp18
21 files changed, 75 insertions, 81 deletions
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 56abd15c6..785a491ad 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -129,9 +129,9 @@ static GObjectClass *parent_class = NULL;
GType
downloader_view_get_type (void)
{
- static GType downloader_view_type = 0;
+ static GType type = 0;
- if (downloader_view_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -146,12 +146,12 @@ downloader_view_get_type (void)
(GInstanceInitFunc) downloader_view_init
};
- downloader_view_type = g_type_register_static (EPHY_TYPE_DIALOG,
- "DownloaderView",
- &our_info, 0);
+ type = g_type_register_static (EPHY_TYPE_DIALOG,
+ "DownloaderView",
+ &our_info, 0);
}
- return downloader_view_type;
+ return type;
}
static void
diff --git a/embed/ephy-command-manager.c b/embed/ephy-command-manager.c
index 9161b7a8c..d2142710f 100644
--- a/embed/ephy-command-manager.c
+++ b/embed/ephy-command-manager.c
@@ -32,7 +32,7 @@ ephy_command_manager_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/ephy-cookie-manager.c b/embed/ephy-cookie-manager.c
index fe0e26f83..ca2f093cf 100644
--- a/embed/ephy-cookie-manager.c
+++ b/embed/ephy-cookie-manager.c
@@ -30,7 +30,7 @@ ephy_cookie_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
type = g_boxed_type_register_static ("EphyCookie",
(GBoxedCopyFunc) ephy_cookie_copy,
@@ -105,7 +105,7 @@ ephy_cookie_manager_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/ephy-download.c b/embed/ephy-download.c
index b78fef143..612a506a4 100644
--- a/embed/ephy-download.c
+++ b/embed/ephy-download.c
@@ -54,9 +54,9 @@ static guint ephy_download_signals[LAST_SIGNAL] = { 0 };
GType
ephy_download_get_type (void)
{
- static GType ephy_download_type = 0;
+ static GType type = 0;
- if (ephy_download_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -71,12 +71,12 @@ ephy_download_get_type (void)
(GInstanceInitFunc) ephy_download_init
};
- ephy_download_type = g_type_register_static (G_TYPE_OBJECT,
- "EphyDownload",
- &our_info, 0);
+ type = g_type_register_static (G_TYPE_OBJECT,
+ "EphyDownload",
+ &our_info, 0);
}
- return ephy_download_type;
+ return type;
}
static void
diff --git a/embed/ephy-embed-dialog.c b/embed/ephy-embed-dialog.c
index 79c9a8836..85e7069ea 100644
--- a/embed/ephy-embed-dialog.c
+++ b/embed/ephy-embed-dialog.c
@@ -59,9 +59,9 @@ static GObjectClass *parent_class = NULL;
GType
ephy_embed_dialog_get_type (void)
{
- static GType ephy_embed_dialog_type = 0;
+ static GType type = 0;
- if (ephy_embed_dialog_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -76,12 +76,12 @@ ephy_embed_dialog_get_type (void)
(GInstanceInitFunc) ephy_embed_dialog_init
};
- ephy_embed_dialog_type = g_type_register_static (EPHY_TYPE_DIALOG,
- "EphyEmbedDialog",
- &our_info, 0);
+ type = g_type_register_static (EPHY_TYPE_DIALOG,
+ "EphyEmbedDialog",
+ &our_info, 0);
}
- return ephy_embed_dialog_type;
+ return type;
}
static void
diff --git a/embed/ephy-embed-event.c b/embed/ephy-embed-event.c
index d0243a111..cde54eb84 100644
--- a/embed/ephy-embed-event.c
+++ b/embed/ephy-embed-event.c
@@ -34,7 +34,7 @@ ephy_embed_event_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/ephy-embed-persist.c b/embed/ephy-embed-persist.c
index 48eeb2a30..aeee7584d 100644
--- a/embed/ephy-embed-persist.c
+++ b/embed/ephy-embed-persist.c
@@ -65,7 +65,7 @@ ephy_embed_persist_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 1bb7c637d..8ff0c9c2a 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -61,7 +61,7 @@ ephy_embed_shell_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 22765f738..75defacb8 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -32,7 +32,7 @@ ephy_embed_single_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 76e8ea0c8..6d3cce0fb 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -55,9 +55,9 @@ ephy_embed_chrome_get_type (void)
GType
ephy_embed_get_type (void)
{
- static GType ephy_embed_type = 0;
+ static GType type = 0;
- if (ephy_embed_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -66,13 +66,12 @@ ephy_embed_get_type (void)
NULL,
};
- ephy_embed_type = g_type_register_static (G_TYPE_INTERFACE,
- "EphyEmbed",
- &our_info,
- (GTypeFlags)0);
+ type = g_type_register_static (G_TYPE_INTERFACE,
+ "EphyEmbed",
+ &our_info, (GTypeFlags)0);
}
- return ephy_embed_type;
+ return type;
}
static void
diff --git a/embed/ephy-encodings.c b/embed/ephy-encodings.c
index 868391c29..bfe640417 100644
--- a/embed/ephy-encodings.c
+++ b/embed/ephy-encodings.c
@@ -174,9 +174,9 @@ static GObjectClass *parent_class = NULL;
GType
ephy_encodings_get_type (void)
{
- static GType ephy_encodings_type = 0;
+ static GType type = 0;
- if (ephy_encodings_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -191,12 +191,12 @@ ephy_encodings_get_type (void)
(GInstanceInitFunc) ephy_encodings_init
};
- ephy_encodings_type = g_type_register_static (G_TYPE_OBJECT,
- "EphyEncodings",
- &our_info, 0);
+ type = g_type_register_static (G_TYPE_OBJECT,
+ "EphyEncodings",
+ &our_info, 0);
}
- return ephy_encodings_type;
+ return type;
}
static void
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index 29d41d2fb..d381afae8 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -82,7 +82,7 @@ ephy_favicon_cache_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index 3b19776cf..9a28af8e3 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -88,7 +88,7 @@ ephy_history_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/ephy-password-manager.c b/embed/ephy-password-manager.c
index c0f1e7838..6a8c3e34e 100644
--- a/embed/ephy-password-manager.c
+++ b/embed/ephy-password-manager.c
@@ -34,7 +34,7 @@ ephy_password_info_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
type = g_boxed_type_register_static ("EphyPasswordInfo",
(GBoxedCopyFunc) ephy_password_info_copy,
@@ -113,7 +113,7 @@ ephy_password_manager_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/ephy-permission-manager.c b/embed/ephy-permission-manager.c
index 7d7626cb7..c06f11107 100644
--- a/embed/ephy-permission-manager.c
+++ b/embed/ephy-permission-manager.c
@@ -34,7 +34,7 @@ ephy_permission_info_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
type = g_boxed_type_register_static ("EphyPermissionInfo",
(GBoxedCopyFunc) ephy_permission_info_copy,
@@ -109,7 +109,7 @@ ephy_permission_manager_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/find-dialog.c b/embed/find-dialog.c
index 861372e47..1c9624da3 100755
--- a/embed/find-dialog.c
+++ b/embed/find-dialog.c
@@ -82,9 +82,9 @@ EphyDialogProperty properties [] =
GType
find_dialog_get_type (void)
{
- static GType find_dialog_type = 0;
+ static GType type = 0;
- if (find_dialog_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -99,12 +99,12 @@ find_dialog_get_type (void)
(GInstanceInitFunc) find_dialog_init
};
- find_dialog_type = g_type_register_static (EPHY_TYPE_EMBED_DIALOG,
- "FindDialog",
- &our_info, 0);
+ type = g_type_register_static (EPHY_TYPE_EMBED_DIALOG,
+ "FindDialog",
+ &our_info, 0);
}
- return find_dialog_type;
+ return type;
}
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index 9360de066..48d05ecb2 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -31,12 +31,9 @@
#include <nsEmbedString.h>
#include <nsMemory.h>
-static void
-mozilla_download_class_init (MozillaDownloadClass *klass);
-static void
-mozilla_download_init (MozillaDownload *ges);
-static void
-mozilla_download_finalize (GObject *object);
+static void mozilla_download_class_init (MozillaDownloadClass *klass);
+static void mozilla_download_init (MozillaDownload *ges);
+static void mozilla_download_finalize (GObject *object);
enum
{
@@ -56,9 +53,9 @@ static GObjectClass *parent_class = NULL;
GType
mozilla_download_get_type (void)
{
- static GType mozilla_download_type = 0;
+ static GType type = 0;
- if (mozilla_download_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -73,13 +70,12 @@ mozilla_download_get_type (void)
(GInstanceInitFunc) mozilla_download_init
};
- mozilla_download_type =
- g_type_register_static (EPHY_TYPE_DOWNLOAD,
- "MozillaDownload",
- &our_info, (GTypeFlags)0);
+ type = g_type_register_static (EPHY_TYPE_DOWNLOAD,
+ "MozillaDownload",
+ &our_info, (GTypeFlags)0);
}
- return mozilla_download_type;
+ return type;
}
static char *
diff --git a/embed/mozilla/mozilla-embed-event.cpp b/embed/mozilla/mozilla-embed-event.cpp
index bca81e286..d7a4b685c 100644
--- a/embed/mozilla/mozilla-embed-event.cpp
+++ b/embed/mozilla/mozilla-embed-event.cpp
@@ -54,7 +54,7 @@ mozilla_embed_event_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index fff6b88e9..4a375abd9 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -62,9 +62,9 @@ static GObjectClass *parent_class = NULL;
GType
mozilla_embed_persist_get_type (void)
{
- static GType mozilla_embed_persist_type = 0;
+ static GType type = 0;
- if (mozilla_embed_persist_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -79,13 +79,12 @@ mozilla_embed_persist_get_type (void)
(GInstanceInitFunc) mozilla_embed_persist_init
};
- mozilla_embed_persist_type =
- g_type_register_static (EPHY_TYPE_EMBED_PERSIST,
- "MozillaEmbedPersist",
- &our_info, (GTypeFlags)0);
+ type = g_type_register_static (EPHY_TYPE_EMBED_PERSIST,
+ "MozillaEmbedPersist",
+ &our_info, (GTypeFlags) 0);
}
- return mozilla_embed_persist_type;
+ return type;
}
static void
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 756c3c4b5..94cba3dee 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -119,7 +119,7 @@ mozilla_embed_single_get_type (void)
{
static GType type = 0;
- if (type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index bf71f361e..f5652be5c 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -128,9 +128,9 @@ ephy_command_manager_iface_init (EphyCommandManagerIface *iface)
GType
mozilla_embed_get_type (void)
{
- static GType mozilla_embed_type = 0;
+ static GType type = 0;
- if (mozilla_embed_type == 0)
+ if (G_UNLIKELY (type == 0))
{
static const GTypeInfo our_info =
{
@@ -159,19 +159,19 @@ mozilla_embed_get_type (void)
NULL
};
- mozilla_embed_type = g_type_register_static (GTK_TYPE_MOZ_EMBED,
- "MozillaEmbed",
- &our_info,
- (GTypeFlags)0);
- g_type_add_interface_static (mozilla_embed_type,
+ type = g_type_register_static (GTK_TYPE_MOZ_EMBED,
+ "MozillaEmbed",
+ &our_info,
+ (GTypeFlags)0);
+ g_type_add_interface_static (type,
EPHY_TYPE_EMBED,
&embed_info);
- g_type_add_interface_static (mozilla_embed_type,
+ g_type_add_interface_static (type,
EPHY_TYPE_COMMAND_MANAGER,
&ephy_command_manager_info);
}
- return mozilla_embed_type;
+ return type;
}
static gboolean
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 20:02:51 +0800