changeset 11986:bfbb1798535e

[gaim-migrate @ 14279] Switch to using the unicode character 0x25cf instead of an asterisk as our password masking character. In the words of the great Christian Hammond, "By the way, isn't it about time we replace the asterisk in masked entries with that unicode character for the round filled circle ("?")? The asterisk is so 1980s." committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 05 Nov 2005 23:42:35 +0000
parents 41d84ac57cb6
children 831e52ceddf3
files src/gtkaccount.c src/gtkblist.c src/gtkgaim.h src/gtkpluginpref.c src/gtkprefs.c src/gtkrequest.c
diffstat 6 files changed, 27 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkaccount.c	Sat Nov 05 21:49:44 2005 +0000
+++ b/src/gtkaccount.c	Sat Nov 05 23:42:35 2005 +0000
@@ -822,6 +822,7 @@
 	/* Password */
 	dialog->password_entry = gtk_entry_new();
 	gtk_entry_set_visibility(GTK_ENTRY(dialog->password_entry), FALSE);
+	gtk_entry_set_invisible_char(GTK_ENTRY(dialog->password_entry), GAIM_INVISIBLE_CHAR);
 	dialog->password_box = add_pref_box(dialog, vbox, _("Password:"),
 										  dialog->password_entry);
 
@@ -1087,7 +1088,10 @@
 
 				entry = gtk_entry_new();
 				if (gaim_account_option_get_masked(option))
+				{
 					gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+					gtk_entry_set_invisible_char(GTK_ENTRY(entry), GAIM_INVISIBLE_CHAR);
+				}
 
 				if (str_value != NULL)
 					gtk_entry_set_text(GTK_ENTRY(entry), str_value);
@@ -1310,6 +1314,7 @@
 	/* Password */
 	dialog->proxy_pass_entry = gtk_entry_new();
 	gtk_entry_set_visibility(GTK_ENTRY(dialog->proxy_pass_entry), FALSE);
+	gtk_entry_set_invisible_char(GTK_ENTRY(dialog->proxy_pass_entry), GAIM_INVISIBLE_CHAR);
 	add_pref_box(dialog, vbox2, _("Pa_ssword:"), dialog->proxy_pass_entry);
 
 	if (dialog->account != NULL &&
--- a/src/gtkblist.c	Sat Nov 05 21:49:44 2005 +0000
+++ b/src/gtkblist.c	Sat Nov 05 23:42:35 2005 +0000
@@ -491,7 +491,10 @@
 			if (value != NULL)
 				gtk_entry_set_text(GTK_ENTRY(input), value);
 			if (pce->secret)
+			{
 				gtk_entry_set_visibility(GTK_ENTRY(input), FALSE);
+				gtk_entry_set_invisible_char(GTK_ENTRY(input), GAIM_INVISIBLE_CHAR);
+			}
 			gtk_box_pack_end(GTK_BOX(rowbox), input, TRUE, TRUE, 0);
 			g_signal_connect(G_OBJECT(input), "changed",
 							 G_CALLBACK(joinchat_set_sensitive_if_input_cb), data);
@@ -4345,7 +4348,10 @@
 			if (value != NULL)
 				gtk_entry_set_text(GTK_ENTRY(input), value);
 			if (pce->secret)
+			{
 				gtk_entry_set_visibility(GTK_ENTRY(input), FALSE);
+				gtk_entry_set_invisible_char(GTK_ENTRY(input), GAIM_INVISIBLE_CHAR);
+			}
 			gtk_box_pack_end(GTK_BOX(rowbox), input, TRUE, TRUE, 0);
 			g_signal_connect(G_OBJECT(input), "changed",
 							 G_CALLBACK(addchat_set_sensitive_if_input_cb), data);
--- a/src/gtkgaim.h	Sat Nov 05 21:49:44 2005 +0000
+++ b/src/gtkgaim.h	Sat Nov 05 23:42:35 2005 +0000
@@ -63,5 +63,7 @@
 #define GAIM_HIG_BORDER        12
 #define GAIM_HIG_BOX_SPACE      6
 
+#define GAIM_INVISIBLE_CHAR (gunichar)0x25cf
+
 #endif /* _GAIM_GTKGAIM_H_ */
 
--- a/src/gtkpluginpref.c	Sat Nov 05 21:49:44 2005 +0000
+++ b/src/gtkpluginpref.c	Sat Nov 05 23:42:35 2005 +0000
@@ -81,8 +81,11 @@
 			gtk_entry_set_text(GTK_ENTRY(entry), gaim_prefs_get_string(pref_name));
 			gtk_entry_set_max_length(GTK_ENTRY(entry),
 									 gaim_plugin_pref_get_max_length(pref));
-			gtk_entry_set_visibility(GTK_ENTRY(entry),
-									 !gaim_plugin_pref_get_masked(pref));
+			if (gaim_plugin_pref_get_masked(pref))
+			{
+				gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+				gtk_entry_set_invisible_char(GTK_ENTRY(entry), GAIM_INVISIBLE_CHAR);
+			}
 			g_signal_connect(G_OBJECT(entry), "changed",
 							 G_CALLBACK(entry_cb),
 							 (gpointer)pref_name);
--- a/src/gtkprefs.c	Sat Nov 05 21:49:44 2005 +0000
+++ b/src/gtkprefs.c	Sat Nov 05 23:42:35 2005 +0000
@@ -1091,6 +1091,7 @@
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
 		gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 1, 2, GTK_FILL , 0, 0, 0);
 		gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+		gtk_entry_set_invisible_char(GTK_ENTRY(entry), GAIM_INVISIBLE_CHAR);
 		g_signal_connect(G_OBJECT(entry), "changed",
 				 G_CALLBACK(proxy_print_option), (void *)PROXYPASS);
 
--- a/src/gtkrequest.c	Sat Nov 05 21:49:44 2005 +0000
+++ b/src/gtkrequest.c	Sat Nov 05 23:42:35 2005 +0000
@@ -413,7 +413,10 @@
 				gtk_entry_set_text(GTK_ENTRY(entry), default_value);
 
 			if (masked)
+			{
 				gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+				gtk_entry_set_invisible_char(GTK_ENTRY(entry), GAIM_INVISIBLE_CHAR);
+			}
 		}
 	}
 
@@ -1113,8 +1116,11 @@
 		if (value != NULL)
 			gtk_entry_set_text(GTK_ENTRY(widget), value);
 
-		gtk_entry_set_visibility(GTK_ENTRY(widget),
-			!gaim_request_field_string_is_masked(field));
+		if (gaim_request_field_string_is_masked(field))
+		{
+			gtk_entry_set_visibility(GTK_ENTRY(widget), FALSE);
+			gtk_entry_set_invisible_char(GTK_ENTRY(widget),	GAIM_INVISIBLE_CHAR);
+		}
 
 		gtk_editable_set_editable(GTK_EDITABLE(widget),
 			gaim_request_field_string_is_editable(field));