From 01e9724d75a273ca43a7c268302d6c3802c8f850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 21 Dec 2023 21:03:41 +0100
Subject: [PATCH] extensions-tool: Rename ENABLED/DISABLED states

Follow the update terminology used by the extension system, in
particular when displaying extension details to the user.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7004

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3073>
---
 .../extensions-tool/man/gnome-extensions.txt     |  2 +-
 subprojects/extensions-tool/src/command-list.c   |  4 ++--
 subprojects/extensions-tool/src/common.h         |  8 ++++----
 subprojects/extensions-tool/src/main.c           | 16 ++++++++--------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/subprojects/extensions-tool/man/gnome-extensions.txt b/subprojects/extensions-tool/man/gnome-extensions.txt
index 0d6b5eaff..7fcc3811e 100644
--- a/subprojects/extensions-tool/man/gnome-extensions.txt
+++ b/subprojects/extensions-tool/man/gnome-extensions.txt
@@ -62,7 +62,7 @@ Prints the program version.
 Enables the extension identified by 'UUID'.
 +
 The command will not detect any errors from the extension itself, use the
-*info* command to confirm that the extension state is *ENABLED*.
+*info* command to confirm that the extension state is *ACTIVE*.
 +
 If the extension is already enabled, the command will do nothing.
 
diff --git a/subprojects/extensions-tool/src/command-list.c b/subprojects/extensions-tool/src/command-list.c
index 62db4d9d3..0ed1968ee 100644
--- a/subprojects/extensions-tool/src/command-list.c
+++ b/subprojects/extensions-tool/src/command-list.c
@@ -87,10 +87,10 @@ list_extensions (ListFilterFlags filter, DisplayFormat format)
       if (type == TYPE_SYSTEM && (filter & LIST_FLAGS_SYSTEM) == 0)
         continue;
 
-      if (state == STATE_ENABLED && (filter & LIST_FLAGS_ENABLED) == 0)
+      if (state == STATE_ACTIVE && (filter & LIST_FLAGS_ENABLED) == 0)
         continue;
 
-      if (state != STATE_ENABLED && (filter & LIST_FLAGS_DISABLED) == 0)
+      if (state != STATE_ACTIVE && (filter & LIST_FLAGS_DISABLED) == 0)
         continue;
 
       if (!has_prefs && (filter & LIST_FLAGS_NO_PREFS) == 0)
diff --git a/subprojects/extensions-tool/src/common.h b/subprojects/extensions-tool/src/common.h
index 74d789e91..69efd0527 100644
--- a/subprojects/extensions-tool/src/common.h
+++ b/subprojects/extensions-tool/src/common.h
@@ -30,14 +30,14 @@ typedef enum {
 } ExtensionType;
 
 typedef enum {
-  STATE_ENABLED = 1,
-  STATE_DISABLED,
+  STATE_ACTIVE = 1,
+  STATE_INACTIVE,
   STATE_ERROR,
   STATE_OUT_OF_DATE,
   STATE_DOWNLOADING,
   STATE_INITIALIZED,
-  STATE_DISABLING,
-  STATE_ENABLING,
+  STATE_DEACTIVATING,
+  STATE_ACTIVATING,
 
   STATE_UNINSTALLED = 99
 } ExtensionState;
diff --git a/subprojects/extensions-tool/src/main.c b/subprojects/extensions-tool/src/main.c
index 327617415..56ae47509 100644
--- a/subprojects/extensions-tool/src/main.c
+++ b/subprojects/extensions-tool/src/main.c
@@ -31,10 +31,10 @@ extension_state_to_string (ExtensionState state)
 {
   switch (state)
     {
-    case STATE_ENABLED:
-      return "ENABLED";
-    case STATE_DISABLED:
-      return "DISABLED";
+    case STATE_ACTIVE:
+      return "ACTIVE";
+    case STATE_INACTIVE:
+      return "INACTIVE";
     case STATE_ERROR:
       return "ERROR";
     case STATE_OUT_OF_DATE:
@@ -43,10 +43,10 @@ extension_state_to_string (ExtensionState state)
       return "DOWNLOADING";
     case STATE_INITIALIZED:
       return "INITIALIZED";
-    case STATE_DISABLING:
-      return "DISABLING";
-    case STATE_ENABLING:
-      return "ENABLING";
+    case STATE_DEACTIVATING:
+      return "DEACTIVATING";
+    case STATE_ACTIVATING:
+      return "ACTIVATING";
     case STATE_UNINSTALLED:
       return "UNINSTALLED";
     }