From 1e862ffc67a5ddb659f9f77399ad6521356afdff Mon Sep 17 00:00:00 2001
From: Anton Lazarev <antonok35@gmail.com>
Date: Fri, 29 Mar 2024 12:37:42 -0700
Subject: [PATCH] sip-account-widget: Use GtkPasswordEntry

Part-of: <https://gitlab.gnome.org/GNOME/calls/-/merge_requests/714>
---
 plugins/provider/sip/calls-sip-account-widget.c | 17 -----------------
 plugins/provider/sip/sip-account-widget.ui      |  8 ++------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/plugins/provider/sip/calls-sip-account-widget.c b/plugins/provider/sip/calls-sip-account-widget.c
index 8011e19..7731c85 100644
--- a/plugins/provider/sip/calls-sip-account-widget.c
+++ b/plugins/provider/sip/calls-sip-account-widget.c
@@ -197,22 +197,6 @@ set_password_visibility (CallsSipAccountWidget *self, gboolean visible)
 }
 
 
-static void
-on_password_visibility_changed (CallsSipAccountWidget *self,
-                                GtkEntryIconPosition   icon_pos,
-                                GdkEvent              *event,
-                                GtkEntry              *entry)
-{
-  gboolean visible;
-
-  g_assert (CALLS_IS_SIP_ACCOUNT_WIDGET (self));
-  g_assert (GTK_IS_ENTRY (entry));
-  g_assert (icon_pos == GTK_ENTRY_ICON_SECONDARY);
-
-  visible = !gtk_entry_get_visibility (entry);
-  set_password_visibility (self, visible);
-}
-
 /*
  * Stop "insert-text" signal emission if any undesired port
  * value occurs
@@ -647,7 +631,6 @@ calls_sip_account_widget_class_init (CallsSipAccountWidgetClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, on_delete_clicked);
   gtk_widget_class_bind_template_callback (widget_class, on_apply_clicked);
   gtk_widget_class_bind_template_callback (widget_class, on_user_changed);
-  gtk_widget_class_bind_template_callback (widget_class, on_password_visibility_changed);
   gtk_widget_class_bind_template_callback (widget_class, on_port_entry_insert_text);
   gtk_widget_class_bind_template_callback (widget_class, on_port_entry_after_insert_text);
 }
diff --git a/plugins/provider/sip/sip-account-widget.ui b/plugins/provider/sip/sip-account-widget.ui
index 1af5312..c701f58 100644
--- a/plugins/provider/sip/sip-account-widget.ui
+++ b/plugins/provider/sip/sip-account-widget.ui
@@ -99,14 +99,10 @@
                   <object class="AdwActionRow">
                     <property name="title" translatable="yes">Password</property>
                     <child>
-                      <object class="GtkEntry" id="password">
+                      <object class="GtkPasswordEntry" id="password">
                         <property name="valign">center</property>
-                        <property name="input-purpose">password</property>
-                        <property name="visibility">False</property>
-                        <property name="primary_icon_sensitive">False</property>
-                        <property name="secondary_icon_name">view-reveal-symbolic</property>
+                        <property name="show-peek-icon">True</property>
                         <signal name="changed" handler="on_user_changed" swapped="yes"/>
-                        <signal name="icon-press" handler="on_password_visibility_changed" swapped="yes"/>
                       </object>
                     </child>
                   </object>