[epiphany/pgriffis/web-extension/bitwarden: 7/7] WebExtensions: Hardcode OS to "linux"




commit 970f7b092d618b3bc66ec34c40aff0982e4849ea
Author: Patrick Griffis <pgriffis igalia com>
Date:   Wed Jun 22 20:55:47 2022 -0500

    WebExtensions: Hardcode OS to "linux"
    
    See https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1145#note_1481425
    
    Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1145>

 src/webextension/api/runtime.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/src/webextension/api/runtime.c b/src/webextension/api/runtime.c
index 26b99aee0..d2b64f561 100644
--- a/src/webextension/api/runtime.c
+++ b/src/webextension/api/runtime.c
@@ -51,24 +51,6 @@ runtime_handler_get_browser_info (EphyWebExtension  *self,
   return json_to_string (root, FALSE);
 }
 
-static const char *
-get_os (void)
-{
-  /* https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/PlatformOs */
-#if defined(__linux__)
-  return "linux";
-#elif defined(_WIN32)
-  return "win";
-#elif defined(__OpenBSD__) || defined(__FreeBSD__)
-  return "openbsd"; /* MDN documents same for both. */
-#elif defined(__APPLE__)
-  return "mac";
-#else
-  #warning "Unknown OS"
-  return "unknown";
-#endif
-}
-
 static const char *
 get_arch (void)
 {
@@ -97,7 +79,9 @@ runtime_handler_get_platform_info (EphyWebExtension  *self,
 
   json_builder_begin_object (builder);
   json_builder_set_member_name (builder, "os");
-  json_builder_add_string_value (builder, get_os ());
+  /* Epiphany doesn't support Windows or macOS and seperating out BSDs is most likely
+   * to be used improperly anyway. */
+  json_builder_add_string_value (builder, "linux");
   json_builder_set_member_name (builder, "arch");
   json_builder_add_string_value (builder, get_arch ());
   json_builder_set_member_name (builder, "nacl_arch");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]