From 4227351c441b392cd54dee671e25760f4986dcc3 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 10 Mar 2009 10:29:03 +0000 Subject: [PATCH] Clear all optionally created widget pointer in priv. Initially priv is 2009-03-10 Alexander Larsson * gtk/gtkmountoperation.c: (gtk_mount_operation_ask_password): Clear all optionally created widget pointer in priv. Initially priv is cleared so thats ok, but on a second call we may have leftovers from previous calls which is problematic if for instance we asked for the user the first time and not the second, then we will access the old priv->username_entry. svn path=/trunk/; revision=22496 --- ChangeLog | 10 ++++++++++ gtk/gtkmountoperation.c | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 349247fbb..2fee18dc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-03-10 Alexander Larsson + + * gtk/gtkmountoperation.c: + (gtk_mount_operation_ask_password): + Clear all optionally created widget pointer in priv. Initially + priv is cleared so thats ok, but on a second call we may have + leftovers from previous calls which is problematic if for instance + we asked for the user the first time and not the second, then we + will access the old priv->username_entry. + 2009-03-06 Michael Natterer * gtk/gtkscalebutton.c (gtk_scale_button_set_property): don't call diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index 66563eeec..add46e85b 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -516,6 +516,7 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op, can_anonymous = flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED; + priv->anonymous_toggle = NULL; if (can_anonymous) { GtkWidget *anon_box; @@ -571,14 +572,17 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op, rows = 0; + priv->username_entry = NULL; if (flags & G_ASK_PASSWORD_NEED_USERNAME) priv->username_entry = table_add_entry (table, rows++, _("_Username:"), default_user, operation); + priv->domain_entry = NULL; if (flags & G_ASK_PASSWORD_NEED_DOMAIN) priv->domain_entry = table_add_entry (table, rows++, _("_Domain:"), default_domain, operation); + priv->password_entry = NULL; if (flags & G_ASK_PASSWORD_NEED_PASSWORD) { priv->password_entry = table_add_entry (table, rows++, _("_Password:"), -- 2.43.2