Update upstream source from tag 'upstream/4.8.2'
Update to upstream version '4.8.2'
with Debian dir 41afed9e06004ec949303d0862339d060e520abd
Norbert Preining
2 years ago
| 766 | 766 |
DesktopEntry *entry,
|
| 767 | 767 |
const char *file_id)
|
| 768 | 768 |
{
|
| 769 | |
const char *file_id_to_use;
|
| 770 | 769 |
menu_verbose (" Adding to set %p entry %s\n", set, file_id);
|
| 771 | 770 |
|
| 772 | 771 |
if (set->hash == NULL)
|
|
| 777 | 776 |
(GDestroyNotify) desktop_entry_unref);
|
| 778 | 777 |
}
|
| 779 | 778 |
|
| 780 | |
if (desktop_entry_get_type (entry) == DESKTOP_ENTRY_DESKTOP) {
|
| 781 | |
file_id_to_use = desktop_entry_get_id (entry);
|
| 782 | |
}
|
| 783 | |
else {
|
| 784 | |
file_id_to_use = file_id;
|
| 785 | |
}
|
| 786 | 779 |
g_hash_table_replace (set->hash,
|
| 787 | |
g_strdup (file_id_to_use),
|
|
780 |
g_strdup (file_id),
|
| 788 | 781 |
desktop_entry_ref (entry));
|
| 789 | 782 |
}
|
| 790 | 783 |
|
| 922 | 922 |
static char *
|
| 923 | 923 |
get_desktop_file_id_from_path (EntryDirectory *ed,
|
| 924 | 924 |
DesktopEntryType entry_type,
|
| 925 | |
const char *relative_path)
|
|
925 |
const char *relative_path,
|
|
926 |
DesktopEntry *entry)
|
| 926 | 927 |
{
|
| 927 | 928 |
char *retval;
|
| 928 | 929 |
|
|
| 930 | 931 |
|
| 931 | 932 |
if (entry_type == DESKTOP_ENTRY_DESKTOP)
|
| 932 | 933 |
{
|
|
934 |
GMenuDesktopAppInfo *appinfo;
|
|
935 |
appinfo = desktop_entry_get_app_info (entry);
|
| 933 | 936 |
retval = g_strdelimit (g_strdup (relative_path), "/", '-');
|
|
937 |
if (gmenu_desktopappinfo_get_is_flatpak (appinfo))
|
|
938 |
{
|
|
939 |
char* tmp;
|
|
940 |
tmp = retval;
|
|
941 |
retval = g_strconcat (retval, GMENU_DESKTOPAPPINFO_FLATPAK_SUFFIX, NULL);
|
|
942 |
g_free (tmp);
|
|
943 |
}
|
| 934 | 944 |
}
|
| 935 | 945 |
else
|
| 936 | 946 |
{
|
|
| 977 | 987 |
|
| 978 | 988 |
file_id = get_desktop_file_id_from_path (ed,
|
| 979 | 989 |
ed->entry_type,
|
| 980 | |
relative_path->str);
|
|
990 |
relative_path->str,
|
|
991 |
entry);
|
| 981 | 992 |
|
| 982 | 993 |
ret = func (ed, entry, file_id, set, user_data);
|
| 983 | 994 |
|
| 0 | |
project('cinnamon-menus', 'c', version : '4.8.1', meson_version: '>=0.40.0')
|
|
0 |
project('cinnamon-menus', 'c', version : '4.8.2', meson_version: '>=0.40.0')
|
| 1 | 1 |
|
| 2 | 2 |
gnome = import('gnome')
|
| 3 | 3 |
|