diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-03-09 16:40:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-03-09 22:21:06 +0100 |
| commit | 4cf54b8616fb6be26f02bd06c0158c3e69fde0db (patch) | |
| tree | 89995c68bc0f8ffac453d711f79818f187b55af7 /configmgr | |
| parent | make Analog Clock sidebar extension demo work (diff) | |
| download | core-4cf54b8616fb6be26f02bd06c0158c3e69fde0db.tar.gz core-4cf54b8616fb6be26f02bd06c0158c3e69fde0db.zip | |
Mark workaround as fixed upstream
Change-Id: I808f0b26916eece2d4fae3c7d1e73c847905adf8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112208
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/dconf.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx index 75c0bb360ce3..1c0711ff1927 100644 --- a/configmgr/source/dconf.cxx +++ b/configmgr/source/dconf.cxx @@ -17,8 +17,11 @@ #include <vector> extern "C" { - // <https://bugzilla.gnome.org/show_bug.cgi?id=754245> - // "common/dconf-changeset.h etc. lack extern "C" wrapper for C++" + //TODO: <https://bugzilla.gnome.org/show_bug.cgi?id=754245> + // "common/dconf-changeset.h etc. lack extern "C" wrapper for C++", fixed on current dconf + // master (towards 0.40?) now with + // <https://gitlab.gnome.org/GNOME/dconf/-/commit/db3d4df6d1a763698f27b013dc42da8d4ae02639> + // "Merge branch 'wip/issue-23' into 'master'" #include <dconf/dconf.h> } |