From 79b4f3b6bd717626687c74ea840ea90293297afa Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Thu, 1 Mar 2007 18:01:02 +0000 Subject: [PATCH] fix double-free reported by Sandino Flores-Moreno. Closes bug #413352. 2007-03-01 Jens Granseuer * main.c: (create_dialog): fix double-free reported by Sandino Flores-Moreno. Closes bug #413352. svn path=/trunk/; revision=7351 --- capplets/display/ChangeLog | 5 +++++ capplets/display/main.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/capplets/display/ChangeLog b/capplets/display/ChangeLog index 333ce9540..cba4dd4e3 100644 --- a/capplets/display/ChangeLog +++ b/capplets/display/ChangeLog @@ -1,3 +1,8 @@ +2007-03-01 Jens Granseuer + + * main.c: (create_dialog): fix double-free reported by Sandino + Flores-Moreno. Closes bug #413352. + 2007-01-29 Kjartan Maraas * main.c: Mark a struct static. diff --git a/capplets/display/main.c b/capplets/display/main.c index 25984f39f..8dd9480a8 100644 --- a/capplets/display/main.c +++ b/capplets/display/main.c @@ -666,20 +666,19 @@ create_dialog (struct DisplayInfo *info) resolution = gconf_client_get_string (client, key, NULL); g_free (key); g_object_unref (client); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (per_computer_check), - resolution != NULL); + info->was_per_computer = resolution != NULL; g_free (resolution); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (per_computer_check), + info->was_per_computer); + gtk_widget_show (per_computer_check); wrapped = wrap_in_label (per_computer_check, _("Options")); gtk_box_pack_start (GTK_BOX (vbox), wrapped, FALSE, FALSE, 0); gtk_widget_show (wrapped); - - g_free (resolution); } info->per_computer_check = per_computer_check;