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

lib/remote: Handle clearing a collection ID in FlatpakRemote 

Squash "" to NULL.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
tingping/wmclass
Philip Withnall 2017-08-11 13:21:20 +01:00 committed by Alexander Larsson
parent 9989188a1e
commit 7b13ff2880
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/flatpak-remote.c
View File

@ -372,7 +372,7 @@ flatpak_remote_get_collection_id (FlatpakRemote *self)
/**
* flatpak_remote_set_collection_id:
* @self: a #FlatpakRemote
* @collection_id: The new collection ID
* @collection_id: (nullable): The new collection ID, or %NULL to unset
*
* Sets the repository collection ID of this remote.
*
@ -386,6 +386,9 @@ flatpak_remote_set_collection_id (FlatpakRemote *self,
{
FlatpakRemotePrivate *priv = flatpak_remote_get_instance_private (self);
if (collection_id != NULL && *collection_id == '\0')
collection_id = NULL;
g_free (priv->local_collection_id);
priv->local_collection_id = g_strdup (collection_id);
priv->local_collection_id_set = TRUE;
@ -813,7 +816,12 @@ flatpak_remote_commit (FlatpakRemote *self,
g_key_file_set_string (config, group, "url", priv->local_url);
if (priv->local_collection_id_set)
g_key_file_set_string (config, group, "collection-id", priv->local_collection_id);
{
if (priv->local_collection_id != NULL)
g_key_file_set_string (config, group, "collection-id", priv->local_collection_id);
else
g_key_file_remove_key (config, group, "collection-id", NULL);
}
if (priv->local_title_set)
g_key_file_set_string (config, group, "xa.title", priv->local_title);