diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-10-04 10:33:38 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-10-04 10:33:38 +0200 |
| commit | b67b77cb8cd37a7ec33ad15702831ab45ced7f64 (patch) | |
| tree | 84c99e53d25947036c7f9e2e24fb3d87469b1459 | |
| parent | c09bd001834eddd296cbfda419b8815e63c24d8c (diff) | |
| download | glibmm-b67b77cb8cd37a7ec33ad15702831ab45ced7f64.tar.gz | |
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
| -rw-r--r-- | gio/src/application.ccg | 2 | ||||
| -rw-r--r-- | 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 { |