diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-05-06 15:33:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-05-06 15:33:15 +0000 |
| commit | febd143ac82cdf82d519ca41b2b9254ae9a3377e (patch) | |
| tree | d876ce8e4c511ee50c80b7fa0bf487b1826bc01f | |
| parent | e00785e9588be8f94ef0060677062bb07c396465 (diff) | |
| parent | 4a4525a65d783251d69c0ce1e2493f8126817649 (diff) | |
| download | gtk+-febd143ac82cdf82d519ca41b2b9254ae9a3377e.tar.gz | |
Merge branch 'emoji-data-prefix-fix' into 'master'
emoji: Use a portable and configuration-dependent path to load the data
See merge request GNOME/gtk!3522
| -rw-r--r-- | gtk/gtkemojichooser.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c index 646be90ed3..97738b947c 100644 --- a/gtk/gtkemojichooser.c +++ b/gtk/gtkemojichooser.c @@ -31,7 +31,6 @@ #include "gtkpopover.h" #include "gtkscrolledwindow.h" #include "gtkintl.h" -#include "gtkprivate.h" #include "gtksearchentryprivate.h" #include "gtktext.h" #include "gtknative.h" @@ -627,11 +626,15 @@ get_emoji_data (void) if (g_error_matches (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND)) { char *filename; + char *gresource_name; GMappedFile *file; g_clear_error (&error); - filename = g_strconcat ("/usr/share/gtk-4.0/emoji/", lang, ".gresource", NULL); + gresource_name = g_strconcat (lang, ".gresource", NULL); + filename = g_build_filename (_gtk_get_data_prefix (), "share", "gtk-4.0", + "emoji", gresource_name, NULL); + g_clear_pointer (&gresource_name, g_free); file = g_mapped_file_new (filename, FALSE, NULL); if (file) |