From fe7c6ed34c96c0b57b0294ccebdab20dd0b702ba Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Fri, 28 Jan 2011 13:18:59 +0000 Subject: chat: add clear secondary icon to password entry Signed-off-by: Jonny Lamb --- libempathy-gtk/empathy-chat.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'libempathy-gtk/empathy-chat.c') diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 7742e0b90..489a0a69a 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -3066,6 +3066,27 @@ passwd_join_button_cb (GtkButton *button, gtk_info_bar_response (GTK_INFO_BAR (data->info_bar), GTK_RESPONSE_OK); } +static void +clear_icon_released_cb (GtkEntry *entry, + GtkEntryIconPosition icon_pos, + GdkEvent *event, + PasswordData *data) +{ + gtk_entry_set_text (entry, ""); +} + +static void +password_entry_changed_cb (GtkEditable *entry, + PasswordData *data) +{ + const gchar *str; + + str = gtk_entry_get_text (GTK_ENTRY (entry)); + + gtk_entry_set_icon_sensitive (GTK_ENTRY (entry), + GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str)); +} + static void display_password_info_bar (EmpathyChat *self) { @@ -3106,6 +3127,16 @@ display_password_info_bar (EmpathyChat *self) gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE); gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), + GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR); + gtk_entry_set_icon_sensitive (GTK_ENTRY (entry), + GTK_ENTRY_ICON_SECONDARY, FALSE); + + g_signal_connect (entry, "icon-release", + G_CALLBACK (clear_icon_released_cb), data); + g_signal_connect (entry, "changed", + G_CALLBACK (password_entry_changed_cb), data); + g_signal_connect (entry, "activate", G_CALLBACK (password_entry_activate_cb), data); -- cgit v1.2.3