summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-04-04 03:25:16 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-04-04 03:25:16 +0000
commit8c8a4c89b83aecbdff9e89e8d14cdc1521be61a1 (patch)
treebf86f92f675404fddbcdf0fb2b8e837f3852d6d9 /gtk
parentc53db1264b062cc2216a3ed6c209ed90399a5ada (diff)
downloadgtk+-8c8a4c89b83aecbdff9e89e8d14cdc1521be61a1.tar.gz
No point in making the error path fast by caching quarks.
2006-04-03 Matthias Clasen <mclasen@redhat.com> * gtk/gtkrecentchooser.c (gtk_recent_chooser_error_quark): * gtk/gtkrecentmanager.c (gtk_recent_manager_error_quark): * gtk/gtkfilechooser.c (gtk_file_chooser_error_quark): * gtk/gtkfilesystem.c (gtk_file_system_error_quark): * gtk/gtkicontheme.c (gtk_icon_theme_error_quark): No point in making the error path fast by caching quarks.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkfilechooser.c5
-rw-r--r--gtk/gtkfilesystem.c5
-rw-r--r--gtk/gtkicontheme.c6
-rw-r--r--gtk/gtkrecentchooser.c5
-rw-r--r--gtk/gtkrecentmanager.c5
5 files changed, 5 insertions, 21 deletions
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 0a138675d1..3f9b943f80 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -292,10 +292,7 @@ gtk_file_chooser_class_init (gpointer g_iface)
GQuark
gtk_file_chooser_error_quark (void)
{
- static GQuark quark = 0;
- if (quark == 0)
- quark = g_quark_from_static_string ("gtk-file-chooser-error-quark");
- return quark;
+ return g_quark_from_static_string ("gtk-file-chooser-error-quark");
}
/**
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 9158d6dba2..4ccc1cac15 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -45,10 +45,7 @@ static void gtk_file_folder_base_init (gpointer g_class);
GQuark
gtk_file_system_error_quark (void)
{
- static GQuark quark = 0;
- if (quark == 0)
- quark = g_quark_from_static_string ("gtk-file-system-error-quark");
- return quark;
+ return g_quark_from_static_string ("gtk-file-system-error-quark");
}
/*****************************************
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 1be4d3660c..19b83f6c6a 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1342,11 +1342,7 @@ gtk_icon_theme_lookup_icon (GtkIconTheme *icon_theme,
GQuark
gtk_icon_theme_error_quark (void)
{
- static GQuark q = 0;
- if (q == 0)
- q = g_quark_from_static_string ("gtk-icon-theme-error-quark");
-
- return q;
+ return g_quark_from_static_string ("gtk-icon-theme-error-quark");
}
/**
diff --git a/gtk/gtkrecentchooser.c b/gtk/gtkrecentchooser.c
index da7a192abb..721d04d6a9 100644
--- a/gtk/gtkrecentchooser.c
+++ b/gtk/gtkrecentchooser.c
@@ -181,10 +181,7 @@ gtk_recent_chooser_class_init (gpointer g_iface)
GQuark
gtk_recent_chooser_error_quark (void)
{
- static GQuark error_quark = 0;
- if (!error_quark)
- error_quark = g_quark_from_static_string ("gtk-recent-chooser-error-quark");
- return error_quark;
+ return g_quark_from_static_string ("gtk-recent-chooser-error-quark");
}
/**
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index cebcee9d5b..62b6482513 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -163,10 +163,7 @@ filename_warning (const char *format, const char *filename, const char *message)
GQuark
gtk_recent_manager_error_quark (void)
{
- static GQuark quark = 0;
- if (quark == 0)
- quark = g_quark_from_static_string ("gtk-recent-manager-error-quark");
- return quark;
+ return g_quark_from_static_string ("gtk-recent-manager-error-quark");
}