From e848a0ac3e42d3556d72fc3e1b4bf267fcf8fccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Sun, 15 Oct 2023 09:34:21 -0700 Subject: [PATCH] icon name in enum --- src/MainWindow.vala | 2 +- src/TabbedWebView.vala | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index d592d9c..192a39c 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -145,7 +145,7 @@ public class Captive.MainWindow : Hdy.ApplicationWindow { } private void update_security (TabbedWebView web_view) { - string icon_name = web_view.security_to_icon_name (); + string icon_name = web_view.security.to_icon_name (); cert_button.image = new Gtk.Image.from_icon_name (icon_name, BUTTON); cert_button.tooltip_text = web_view.security_to_string (); diff --git a/src/TabbedWebView.vala b/src/TabbedWebView.vala index 2985846..683313d 100644 --- a/src/TabbedWebView.vala +++ b/src/TabbedWebView.vala @@ -27,7 +27,24 @@ public class Captive.TabbedWebView : WebKit.WebView { NONE, SECURE, LOADING, - MIXED_CONTENT + MIXED_CONTENT; + + public string to_icon_name () { + switch (this) { + case NONE: + return "security-low-symbolic"; + + case SECURE: + return "security-high-symbolic"; + + case MIXED_CONTENT: + return "security-medium-symbolic"; + + case LOADING: + default: + return "content-loading-symbolic"; + }; + } } public TabbedWebView (bool load_cookies) { @@ -86,23 +103,6 @@ public class Captive.TabbedWebView : WebKit.WebView { }; } - public string security_to_icon_name () { - switch (security) { - case NONE: - return "security-low-symbolic"; - - case SECURE: - return "security-high-symbolic"; - - case MIXED_CONTENT: - return "security-medium-symbolic"; - - case LOADING: - default: - return "content-loading-symbolic"; - }; - } - private void update_tls_info () { TlsCertificate cert; TlsCertificateFlags cert_flags;