callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I#1646 - Emoji picker empty

Browse Source 
Embed emoji.data as expected by the copy of the gtk+' emoji chooser dialog.

Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1646
This commit is contained in:
Milan Crha
2021-10-04 17:18:35 +02:00
parent bdcf0809e4
commit e75c4faa36
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/emoji.data Normal file
View File

Binary file not shown.

6
data/org.gnome.Evolution.gresource.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<gresources>
<gresource prefix="org.gnome.Evolution">
<file>emoji.data</file>
</gresource>
</gresources>

4
src/e-util/CMakeLists.txt
View File

@ -30,6 +30,8 @@ if(WIN32)
)
endif(WIN32)
glib_compile_resources(${CMAKE_SOURCE_DIR}/data/ ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.gresource org_gnome_evolution ../../data/org.gnome.Evolution.gresource.xml ${CMAKE_SOURCE_DIR}/data/emoji.data)
# Main libevolution-util
set(DEPENDENCIES
@ -309,6 +311,8 @@ set(SOURCES
${PLATFORM_SOURCES}
${CMAKE_CURRENT_BINARY_DIR}/e-marshal.c
${CMAKE_CURRENT_BINARY_DIR}/e-util-enumtypes.c
${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.gresource.c
${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.gresource.h
)
set(HEADERS

2
src/e-util/e-gtkemojichooser.c
View File

@ -444,7 +444,7 @@ populate_emoji_chooser (gpointer data)
if (!chooser->data)
{
bytes = g_resources_lookup_data ("/org/gtk/libgtk/emoji/emoji.data", 0, NULL);
bytes = g_resources_lookup_data ("/org.gnome.Evolution/emoji.data", 0, NULL);
chooser->data = g_variant_ref_sink (g_variant_new_from_bytes (G_VARIANT_TYPE ("a(auss)"), bytes, TRUE));
}