marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make X-Flatpak-RenamedFrom a list so that we can handle multiple renames 

Fixes https://github.com/flatpak/flatpak-builder/issues/184

Closes: #193
Approved by: alexlarsson
auto
Alexander Larsson 2018-08-07 13:15:56 +02:00 committed by Atomic Bot
parent 1a01c7bc61
commit d0a489d90c
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/builder-manifest.c
View File

@ -2523,10 +2523,29 @@ builder_manifest_cleanup (BuilderManifest *self,
return FALSE;
if (self->rename_desktop_file)
g_key_file_set_string (keyfile,
G_KEY_FILE_DESKTOP_GROUP,
"X-Flatpak-RenamedFrom",
self->rename_desktop_file);
{
g_auto(GStrv) old_renames = g_key_file_get_string_list (keyfile,
G_KEY_FILE_DESKTOP_GROUP,
"X-Flatpak-RenamedFrom",
NULL, NULL);
const char **new_renames = NULL;
int old_rename_len = 0;
int new_rename_len = 0;
if (old_renames)
old_rename_len = g_strv_length (old_renames);
new_renames = g_new (const char *, old_rename_len + 2);
for (i = 0; i < old_rename_len; i++)
new_renames[new_rename_len++] = old_renames[i];
new_renames[new_rename_len++] = self->rename_desktop_file;
new_renames[new_rename_len] = NULL;
g_key_file_set_string_list (keyfile,
G_KEY_FILE_DESKTOP_GROUP,
"X-Flatpak-RenamedFrom",
new_renames, new_rename_len);
}
desktop_keys = g_key_file_get_keys (keyfile,
G_KEY_FILE_DESKTOP_GROUP,