[glibmm/glibmm-2-66] Glib::Binding, Gio::Application: Don't use g_quark_from_static_string()
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm/glibmm-2-66] Glib::Binding, Gio::Application: Don't use g_quark_from_static_string()
- Date: Mon, 4 Oct 2021 08:37:05 +0000 (UTC)
commit b67b77cb8cd37a7ec33ad15702831ab45ced7f64
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Mon Oct 4 10:33:38 2021 +0200
Glib::Binding, Gio::Application: Don't use g_quark_from_static_string()
Replace it by g_quark_from_string().
g_quark_from_static_string() can't be used for initializing static
data, if glibmm (but not glib) is loaded and unloaded several times.
Fixes #96
gio/src/application.ccg | 2 +-
glib/src/binding.ccg | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gio/src/application.ccg b/gio/src/application.ccg
index ab639fb3..ed732daf 100644
--- a/gio/src/application.ccg
+++ b/gio/src/application.ccg
@@ -43,7 +43,7 @@ struct ExtraApplicationData
};
GQuark quark_extra_application_data =
- g_quark_from_static_string("glibmm__Gio::Application::quark_extra_application_data");
+ g_quark_from_string("glibmm__Gio::Application::quark_extra_application_data");
void
Application_delete_extra_application_data(gpointer data)
diff --git a/glib/src/binding.ccg b/glib/src/binding.ccg
index 4dc0f289..f9fa92cf 100644
--- a/glib/src/binding.ccg
+++ b/glib/src/binding.ccg
@@ -20,7 +20,7 @@
namespace
{
// TODO: When we can break ABI, replace this GQuark by a new data member in Glib::Binding.
-GQuark quark_manage = g_quark_from_static_string("glibmm__Glib::Binding::manage");
+GQuark quark_manage = g_quark_from_string("glibmm__Glib::Binding::manage");
struct BindingTransformSlots
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]