diff options
| author | Matthew Leeds <matthew.leeds@endlessm.com> | 2019-09-01 09:39:13 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2019-09-09 10:01:15 +0000 |
| commit | f88a9d958553195b1b32d644231969fe98844501 (patch) | |
| tree | aa847e8d709f862612d9f29f2a1d2239b7520d74 | |
| parent | 1a5306360d815b845c7dbcf7af96381754f916fc (diff) | |
| download | flatpak-f88a9d958553195b1b32d644231969fe98844501.tar.gz | |
Use defined macro SYSTEM_DIR_DEFAULT_ID more
Just replace hardcoded strings with the macro, no functional change.
Closes: #3077
Approved by: alexlarsson
| -rw-r--r-- | app/flatpak-cli-transaction.c | 2 | ||||
| -rw-r--r-- | app/flatpak-main.c | 2 | ||||
| -rw-r--r-- | common/flatpak-dir-private.h | 5 | ||||
| -rw-r--r-- | common/flatpak-dir.c | 9 |
4 files changed, 9 insertions, 9 deletions
diff --git a/app/flatpak-cli-transaction.c b/app/flatpak-cli-transaction.c index 8a69eadf..6ec1372d 100644 --- a/app/flatpak-cli-transaction.c +++ b/app/flatpak-cli-transaction.c @@ -982,7 +982,7 @@ transaction_ready (FlatpakTransaction *transaction) if (flatpak_installation_get_is_user (installation)) ret = flatpak_yes_no_prompt (TRUE, _("Proceed with these changes to the user installation?")); - else if (g_strcmp0 (id, "default") == 0) + else if (g_strcmp0 (id, SYSTEM_DIR_DEFAULT_ID) == 0) ret = flatpak_yes_no_prompt (TRUE, _("Proceed with these changes to the system installation?")); else ret = flatpak_yes_no_prompt (TRUE, _("Proceed with these changes to the %s?"), name); diff --git a/app/flatpak-main.c b/app/flatpak-main.c index 451583b3..0bf2387b 100644 --- a/app/flatpak-main.c +++ b/app/flatpak-main.c @@ -411,7 +411,7 @@ flatpak_option_context_parse (GOptionContext *context, { FlatpakDir *dir = g_ptr_array_index (system_dirs, i); const char *id = flatpak_dir_get_id (dir); - if (g_strcmp0 (id, "default") != 0) + if (g_strcmp0 (id, SYSTEM_DIR_DEFAULT_ID) != 0) g_ptr_array_add (dirs, g_object_ref (dir)); } } diff --git a/common/flatpak-dir-private.h b/common/flatpak-dir-private.h index 7111e31b..c8d0d74e 100644 --- a/common/flatpak-dir-private.h +++ b/common/flatpak-dir-private.h @@ -40,6 +40,11 @@ #define FLATPAK_DIR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_DIR, FlatpakDir)) #define FLATPAK_IS_DIR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FLATPAK_TYPE_DIR)) +#define SYSTEM_DIR_DEFAULT_ID "default" +#define SYSTEM_DIR_DEFAULT_DISPLAY_NAME _("Default system installation") +#define SYSTEM_DIR_DEFAULT_STORAGE_TYPE FLATPAK_DIR_STORAGE_TYPE_DEFAULT +#define SYSTEM_DIR_DEFAULT_PRIORITY 0 + #define FLATPAK_TYPE_DEPLOY flatpak_deploy_get_type () #define FLATPAK_DEPLOY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_DEPLOY, FlatpakDeploy)) #define FLATPAK_IS_DEPLOY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FLATPAK_TYPE_DEPLOY)) diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 38241d36..01a46f8f 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -66,11 +66,6 @@ #define SYSCONF_REMOTES_DIR "remotes.d" #define SYSCONF_REMOTES_FILE_EXT ".flatpakrepo" -#define SYSTEM_DIR_DEFAULT_ID "default" -#define SYSTEM_DIR_DEFAULT_DISPLAY_NAME _("Default system installation") -#define SYSTEM_DIR_DEFAULT_STORAGE_TYPE FLATPAK_DIR_STORAGE_TYPE_DEFAULT -#define SYSTEM_DIR_DEFAULT_PRIORITY 0 - static FlatpakOciRegistry *flatpak_dir_create_system_child_oci_registry (FlatpakDir *self, GLnxLockFile *file_lock, GError **error); @@ -783,7 +778,7 @@ is_good_installation_id (const char *id) { if (strcmp (id, "") == 0 || strcmp (id, "user") == 0 || - strcmp (id, "default") == 0 || + strcmp (id, SYSTEM_DIR_DEFAULT_ID) == 0 || strcmp (id, "system") == 0) return FALSE; @@ -1872,7 +1867,7 @@ flatpak_dir_get_name (FlatpakDir *self) return g_strdup ("user"); id = flatpak_dir_get_id (self); - if (id != NULL && g_strcmp0 (id, "default") != 0) + if (id != NULL && g_strcmp0 (id, SYSTEM_DIR_DEFAULT_ID) != 0) return g_strdup_printf ("system (%s)", id); return g_strdup ("system"); |