From 24b396b4a8033e74dba5649d2280d0c4142127d6 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Tue, 29 Apr 2008 07:26:29 +0000
Subject: [PATCH] use default invisible char in all windows. Fixes #3905

---
 .../account_creation_wizard_window.glade      |   2 -
 data/glade/account_modification_window.glade  |   7 -
 data/glade/accounts_window.glade              |   5 -
 data/glade/add_new_contact_window.glade       |   2 -
 .../glade/advanced_configuration_window.glade |   1 -
 .../glade/advanced_notifications_window.glade |   3 -
 data/glade/change_mood_dialog.glade           |   1 -
 data/glade/change_password_dialog.glade       |   2 -
 data/glade/dubbleinput_dialog.glade           |   2 -
 data/glade/edit_groups_dialog.glade           |   1 -
 data/glade/groups_post_window.glade           |   2 -
 data/glade/input_dialog.glade                 |   1 -
 data/glade/join_groupchat_window.glade        |   3 -
 data/glade/manage_bookmarks_window.glade      |   5 -
 data/glade/manage_proxies_window.glade        |   5 -
 data/glade/passphrase_dialog.glade            | 247 +++++++-----------
 data/glade/privacy_lists_window.glade         |   1 -
 data/glade/single_message_window.glade        |   3 -
 data/glade/zeroconf_properties_window.glade   |   6 -
 19 files changed, 98 insertions(+), 201 deletions(-)

diff --git a/data/glade/account_creation_wizard_window.glade b/data/glade/account_creation_wizard_window.glade
index 6b2c246a7..73b8f769a 100644
--- a/data/glade/account_creation_wizard_window.glade
+++ b/data/glade/account_creation_wizard_window.glade
@@ -143,7 +143,6 @@ to the Jabber network.</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="has_focus">True</property>
-                        <property name="invisible_char">*</property>
                         <signal name="changed" handler="on_username_entry_changed"/>
                         <signal name="key_press_event" handler="on_username_entry_key_press_event"/>
                       </widget>
@@ -227,7 +226,6 @@ to the Jabber network.</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="visibility">False</property>
-                        <property name="invisible_char">*</property>
                         <property name="activates_default">True</property>
                       </widget>
                       <packing>
diff --git a/data/glade/account_modification_window.glade b/data/glade/account_modification_window.glade
index 06898adcd..1674103db 100644
--- a/data/glade/account_modification_window.glade
+++ b/data/glade/account_modification_window.glade
@@ -68,7 +68,6 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -173,7 +172,6 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
 		  <property name="activates_default">True</property>
 		</widget>
 		<packing>
@@ -408,7 +406,6 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
 		  <property name="activates_default">True</property>
 		</widget>
 		<packing>
@@ -430,7 +427,6 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes">Gajim</property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -812,7 +808,6 @@
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
 				  <signal name="changed" handler="on_custom_host_entry_changed" last_modification_time="Mon, 13 Jun 2005 10:44:25 GMT"/>
 				</widget>
@@ -857,7 +852,6 @@
 				  <property name="max_length">0</property>
 				  <property name="text">5222</property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
 				  <property name="width_chars">6</property>
 				  <signal name="changed" handler="on_custom_port_entry_changed" last_modification_time="Mon, 13 Jun 2005 10:44:32 GMT"/>
@@ -1092,7 +1086,6 @@
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
 				</widget>
 				<packing>
diff --git a/data/glade/accounts_window.glade b/data/glade/accounts_window.glade
index d69f9207b..0f9224cfa 100644
--- a/data/glade/accounts_window.glade
+++ b/data/glade/accounts_window.glade
@@ -181,7 +181,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="tooltip" translatable="yes">Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)</property>
-                            <property name="invisible_char">*</property>
                             <property name="text" translatable="yes">Gajim</property>
                             <signal name="focus_out_event" handler="on_resource_entry1_focus_out_event"/>
                           </widget>
@@ -198,7 +197,6 @@
                           <widget class="GtkEntry" id="jid_entry1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="invisible_char">*</property>
                             <property name="activates_default">True</property>
                             <signal name="focus_out_event" handler="on_jid_entry1_focus_out_event"/>
                           </widget>
@@ -360,7 +358,6 @@
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
                             <property name="visibility">False</property>
-                            <property name="invisible_char">*</property>
                             <property name="activates_default">True</property>
                             <signal name="changed" handler="on_password_entry1_changed"/>
                           </widget>
@@ -684,7 +681,6 @@
                                           <widget class="GtkEntry" id="custom_host_entry1">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="invisible_char">*</property>
                                             <signal name="changed" handler="on_custom_host_entry1_changed"/>
                                           </widget>
                                           <packing>
@@ -706,7 +702,6 @@
                                           <widget class="GtkEntry" id="custom_port_entry1">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="invisible_char">*</property>
                                             <property name="width_chars">6</property>
                                             <property name="text">5222</property>
                                             <signal name="focus_out_event" handler="on_custom_port_entry_focus_out_event"/>
diff --git a/data/glade/add_new_contact_window.glade b/data/glade/add_new_contact_window.glade
index 004d86963..fabacacc6 100644
--- a/data/glade/add_new_contact_window.glade
+++ b/data/glade/add_new_contact_window.glade
@@ -125,7 +125,6 @@
               <widget class="GtkEntry" id="uid_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">*</property>
                 <property name="activates_default">True</property>
                 <signal name="changed" handler="on_uid_entry_changed"/>
               </widget>
@@ -154,7 +153,6 @@
               <widget class="GtkEntry" id="nickname_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">*</property>
                 <property name="activates_default">True</property>
               </widget>
               <packing>
diff --git a/data/glade/advanced_configuration_window.glade b/data/glade/advanced_configuration_window.glade
index 2aa939d5d..2d6d6a741 100644
--- a/data/glade/advanced_configuration_window.glade
+++ b/data/glade/advanced_configuration_window.glade
@@ -76,7 +76,6 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	      <signal name="changed" handler="on_advanced_entry_changed" last_modification_time="Wed, 27 Apr 2005 11:58:56 GMT"/>
 	    </widget>
diff --git a/data/glade/advanced_notifications_window.glade b/data/glade/advanced_notifications_window.glade
index eed865ceb..ffbacbb0b 100644
--- a/data/glade/advanced_notifications_window.glade
+++ b/data/glade/advanced_notifications_window.glade
@@ -233,7 +233,6 @@ everybody</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="no_show_all">True</property>
-                        <property name="invisible_char">*</property>
                         <signal name="changed" handler="on_recipient_list_entry_changed"/>
                       </widget>
                       <packing>
@@ -550,7 +549,6 @@ everybody</property>
                                       <widget class="GtkEntry" id="sound_entry">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="invisible_char">*</property>
                                         <signal name="changed" handler="on_sound_entry_changed"/>
                                       </widget>
                                     </child>
@@ -711,7 +709,6 @@ everybody</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="invisible_char">*</property>
                             <signal name="changed" handler="on_command_entry_changed"/>
                           </widget>
                           <packing>
diff --git a/data/glade/change_mood_dialog.glade b/data/glade/change_mood_dialog.glade
index cebb1ea25..84db6b91f 100644
--- a/data/glade/change_mood_dialog.glade
+++ b/data/glade/change_mood_dialog.glade
@@ -22,7 +22,6 @@
               <widget class="GtkEntry" id="description_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/data/glade/change_password_dialog.glade b/data/glade/change_password_dialog.glade
index 562d3ae9c..9c4de59d2 100644
--- a/data/glade/change_password_dialog.glade
+++ b/data/glade/change_password_dialog.glade
@@ -128,7 +128,6 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -172,7 +171,6 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
 		  <property name="activates_default">True</property>
 		</widget>
 		<packing>
diff --git a/data/glade/dubbleinput_dialog.glade b/data/glade/dubbleinput_dialog.glade
index e9e6f965c..0b3672502 100644
--- a/data/glade/dubbleinput_dialog.glade
+++ b/data/glade/dubbleinput_dialog.glade
@@ -138,7 +138,6 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
 	    </widget>
 	    <packing>
@@ -182,7 +181,6 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">●</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
diff --git a/data/glade/edit_groups_dialog.glade b/data/glade/edit_groups_dialog.glade
index 9cedd08bc..0a9e88433 100644
--- a/data/glade/edit_groups_dialog.glade
+++ b/data/glade/edit_groups_dialog.glade
@@ -119,7 +119,6 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
 	    </widget>
 	    <packing>
diff --git a/data/glade/groups_post_window.glade b/data/glade/groups_post_window.glade
index d81bf5fb1..d7c628000 100644
--- a/data/glade/groups_post_window.glade
+++ b/data/glade/groups_post_window.glade
@@ -99,7 +99,6 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">●</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -120,7 +119,6 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">●</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
diff --git a/data/glade/input_dialog.glade b/data/glade/input_dialog.glade
index 77b17f1f2..12912060c 100644
--- a/data/glade/input_dialog.glade
+++ b/data/glade/input_dialog.glade
@@ -138,7 +138,6 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
 	    </widget>
 	    <packing>
diff --git a/data/glade/join_groupchat_window.glade b/data/glade/join_groupchat_window.glade
index d6c94709d..4c13f84fc 100644
--- a/data/glade/join_groupchat_window.glade
+++ b/data/glade/join_groupchat_window.glade
@@ -46,7 +46,6 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
 	      <signal name="changed" handler="on_required_entry_changed" last_modification_time="Sat, 14 Jan 2006 21:51:39 GMT"/>
 	    </widget>
@@ -68,7 +67,6 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
 	      <signal name="changed" handler="on_required_entry_changed" last_modification_time="Sat, 14 Jan 2006 21:51:24 GMT"/>
 	    </widget>
@@ -219,7 +217,6 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
 	    </widget>
 	    <packing>
diff --git a/data/glade/manage_bookmarks_window.glade b/data/glade/manage_bookmarks_window.glade
index 26e168033..52e417265 100644
--- a/data/glade/manage_bookmarks_window.glade
+++ b/data/glade/manage_bookmarks_window.glade
@@ -97,7 +97,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="visibility">False</property>
-                    <property name="invisible_char">*</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -111,7 +110,6 @@
                   <widget class="GtkEntry" id="server_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">*</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -151,7 +149,6 @@
                   <widget class="GtkEntry" id="room_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">*</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -165,7 +162,6 @@
                   <widget class="GtkEntry" id="nick_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">*</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -203,7 +199,6 @@
                   <widget class="GtkEntry" id="title_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">*</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
diff --git a/data/glade/manage_proxies_window.glade b/data/glade/manage_proxies_window.glade
index d4f612280..758cfcce7 100644
--- a/data/glade/manage_proxies_window.glade
+++ b/data/glade/manage_proxies_window.glade
@@ -234,7 +234,6 @@ SOCKS5</property>
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <signal name="changed" handler="on_proxyname_entry_changed" last_modification_time="Wed, 08 Jun 2005 17:43:44 GMT"/>
 			    </widget>
@@ -349,7 +348,6 @@ SOCKS5</property>
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <signal name="changed" handler="on_proxyhost_entry_changed" last_modification_time="Wed, 08 Jun 2005 20:56:20 GMT"/>
 			    </widget>
@@ -371,7 +369,6 @@ SOCKS5</property>
 			      <property name="max_length">0</property>
 			      <property name="text"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <signal name="changed" handler="on_proxyport_entry_changed" last_modification_time="Wed, 08 Jun 2005 20:57:45 GMT"/>
 			    </widget>
@@ -480,7 +477,6 @@ SOCKS5</property>
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <signal name="changed" handler="on_proxypass_entry_changed" last_modification_time="Wed, 08 Jun 2005 20:58:01 GMT"/>
 			    </widget>
@@ -502,7 +498,6 @@ SOCKS5</property>
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <signal name="changed" handler="on_proxyuser_entry_changed" last_modification_time="Wed, 08 Jun 2005 20:57:53 GMT"/>
 			    </widget>
diff --git a/data/glade/passphrase_dialog.glade b/data/glade/passphrase_dialog.glade
index bc49f3475..104349b9f 100644
--- a/data/glade/passphrase_dialog.glade
+++ b/data/glade/passphrase_dialog.glade
@@ -1,151 +1,100 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
 <glade-interface>
-
-<widget class="GtkDialog" id="passphrase_dialog">
-  <property name="border_width">12</property>
-  <property name="title" translatable="yes">Passphrase</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
-  <signal name="destroy" handler="on_passphrase_dialog_destroy" last_modification_time="Sun, 11 Mar 2007 11:32:38 GMT"/>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox4">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area3">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox30">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="message_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">True</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">5</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="passphrase_entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="has_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">False</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="save_passphrase_checkbutton">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
+  <widget class="GtkDialog" id="passphrase_dialog">
+    <property name="border_width">12</property>
+    <property name="title" translatable="yes">Passphrase</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <signal name="destroy" handler="on_passphrase_dialog_destroy"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox4">
+        <property name="visible">True</property>
+        <property name="spacing">6</property>
+        <child>
+          <widget class="GtkVBox" id="vbox30">
+            <property name="visible">True</property>
+            <property name="border_width">6</property>
+            <property name="spacing">6</property>
+            <child>
+              <widget class="GtkLabel" id="message_label">
+                <property name="visible">True</property>
+                <property name="wrap">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">5</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="passphrase_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="has_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="activates_default">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="save_passphrase_checkbutton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="use_underline">True</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="cancel_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-6</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="ok_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-5</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>
diff --git a/data/glade/privacy_lists_window.glade b/data/glade/privacy_lists_window.glade
index 1513ce317..273929983 100644
--- a/data/glade/privacy_lists_window.glade
+++ b/data/glade/privacy_lists_window.glade
@@ -139,7 +139,6 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char">●</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
diff --git a/data/glade/single_message_window.glade b/data/glade/single_message_window.glade
index 67feb0147..f65415d70 100644
--- a/data/glade/single_message_window.glade
+++ b/data/glade/single_message_window.glade
@@ -51,7 +51,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="no_show_all">True</property>
-                <property name="invisible_char">*</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
@@ -79,7 +78,6 @@
               <widget class="GtkEntry" id="subject_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">*</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
@@ -94,7 +92,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="no_show_all">True</property>
-                <property name="invisible_char">*</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/data/glade/zeroconf_properties_window.glade b/data/glade/zeroconf_properties_window.glade
index c296fe4d5..74ed70de8 100644
--- a/data/glade/zeroconf_properties_window.glade
+++ b/data/glade/zeroconf_properties_window.glade
@@ -144,7 +144,6 @@ You might consider to change possible firewall settings.</property>
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char">●</property>
 			  <property name="activates_default">False</property>
 			  <property name="width_chars">6</property>
 			</widget>
@@ -210,7 +209,6 @@ You might consider to change possible firewall settings.</property>
 		      <property name="max_length">0</property>
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
-		      <property name="invisible_char">●</property>
 		      <property name="activates_default">False</property>
 		    </widget>
 		    <packing>
@@ -287,7 +285,6 @@ You might consider to change possible firewall settings.</property>
 		      <property name="max_length">0</property>
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
-		      <property name="invisible_char">●</property>
 		      <property name="activates_default">False</property>
 		    </widget>
 		    <packing>
@@ -336,7 +333,6 @@ You might consider to change possible firewall settings.</property>
 		      <property name="max_length">0</property>
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
-		      <property name="invisible_char">●</property>
 		      <property name="activates_default">False</property>
 		    </widget>
 		    <packing>
@@ -385,7 +381,6 @@ You might consider to change possible firewall settings.</property>
 		      <property name="max_length">0</property>
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
-		      <property name="invisible_char">●</property>
 		      <property name="activates_default">False</property>
 		    </widget>
 		    <packing>
@@ -573,7 +568,6 @@ You might consider to change possible firewall settings.</property>
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			    </widget>
 			    <packing>