diff options
| -rw-r--r-- | common/flatpak-remote.c | 27 | ||||
| -rw-r--r-- | tests/testlibrary.c | 3 |
2 files changed, 20 insertions, 10 deletions
diff --git a/common/flatpak-remote.c b/common/flatpak-remote.c index 7ef4cf58..42afcc06 100644 --- a/common/flatpak-remote.c +++ b/common/flatpak-remote.c @@ -423,7 +423,7 @@ flatpak_remote_get_title (FlatpakRemote *self) /** * flatpak_remote_set_title: * @self: a #FlatpakRemote - * @title: The new title + * @title: The new title, or %NULL to unset * * Sets the repository title of this remote. * @@ -709,7 +709,7 @@ flatpak_remote_get_default_branch (FlatpakRemote *self) /** * flatpak_remote_set_default_branch: * @self: a #FlatpakRemote - * @default_branch: The new default_branch + * @default_branch: The new default_branch, or %NULL to unset * * Sets the default branch configured for this remote. * @@ -1181,6 +1181,18 @@ flatpak_remote_commit_filter (FlatpakRemote *self, return TRUE; } +static void +_key_file_set_or_unset_string (GKeyFile *config, + const char *group, + const char *key, + const char *value) +{ + if (value != NULL) + g_key_file_set_string (config, group, key, value); + else + g_key_file_remove_key (config, group, key, NULL); +} + gboolean flatpak_remote_commit (FlatpakRemote *self, FlatpakDir *dir, @@ -1214,15 +1226,10 @@ flatpak_remote_commit (FlatpakRemote *self, g_key_file_set_string (config, group, "url", priv->local_url); if (priv->local_collection_id_set) - { - 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); - } + _key_file_set_or_unset_string (config, group, "collection-id", priv->local_collection_id); if (priv->local_title_set) - g_key_file_set_string (config, group, "xa.title", priv->local_title); + _key_file_set_or_unset_string (config, group, "xa.title", priv->local_title); if (priv->local_filter_set) g_key_file_set_string (config, group, "xa.filter", priv->local_filter ? priv->local_filter : ""); @@ -1240,7 +1247,7 @@ flatpak_remote_commit (FlatpakRemote *self, g_key_file_set_string (config, group, "xa.icon", priv->local_icon); if (priv->local_default_branch_set) - g_key_file_set_string (config, group, "xa.default-branch", priv->local_default_branch); + _key_file_set_or_unset_string (config, group, "xa.default-branch", priv->local_default_branch); if (priv->local_main_ref_set) g_key_file_set_string (config, group, "xa.main-ref", priv->local_main_ref); diff --git a/tests/testlibrary.c b/tests/testlibrary.c index 509ce6cc..925c9cc2 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c @@ -701,9 +701,12 @@ test_remote (void) g_assert_cmpstr (flatpak_remote_get_default_branch (remote), ==, "master"); /* back to defaults */ + flatpak_remote_set_title (remote, NULL); + flatpak_remote_set_prio (remote, 1); flatpak_remote_set_noenumerate (remote, FALSE); flatpak_remote_set_nodeps (remote, FALSE); flatpak_remote_set_disabled (remote, FALSE); + flatpak_remote_set_default_branch (remote, NULL); flatpak_remote_set_gpg_verify (remote, TRUE); flatpak_remote_set_collection_id (remote, repo_collection_id); |