From 9b63de40b6f0f65a1ced9c73ccb8b47d7f34541e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 1 Apr 2002 23:47:51 +0000 Subject: Set 're' as the parent window rather than as the parent widget. 2002-04-01 Jeffrey Stedfast * rule-editor.c (rule_edit): Set 're' as the parent window rather than as the parent widget. (add_editor_clicked): Only unref the editor if it is non-NULL. svn path=/trunk/; revision=16317 --- filter/ChangeLog | 6 ++++++ filter/filtertypes.xml | 2 +- filter/rule-editor.c | 13 +++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/filter/ChangeLog b/filter/ChangeLog index d78ed9ec60..28d0cd862f 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,9 @@ +2002-04-01 Jeffrey Stedfast + + * rule-editor.c (rule_edit): Set 're' as the parent window rather + than as the parent widget. + (add_editor_clicked): Only unref the editor if it is non-NULL. + 2002-03-18 Jeffrey Stedfast * filter-source.c (filter_source_get_sources): Free account_name diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml index b638288609..a0accfa338 100644 --- a/filter/filtertypes.xml +++ b/filter/filtertypes.xml @@ -561,7 +561,7 @@ - + diff --git a/filter/rule-editor.c b/filter/rule-editor.c index 63dbd7e388..f01b93c380 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -255,9 +255,8 @@ add_editor_clicked (GtkWidget *dialog, int button, RuleEditor *re) case -1: if (re->edit) { gtk_object_unref (GTK_OBJECT (re->edit)); - } - - re->edit = NULL; + re->edit = NULL; + } re->dialog = NULL; @@ -330,8 +329,10 @@ edit_editor_clicked (GtkWidget *dialog, int button, RuleEditor *re) default: gnome_dialog_close (GNOME_DIALOG (dialog)); case -1: - gtk_object_unref (GTK_OBJECT (re->edit)); - re->edit = NULL; + if (re->edit) { + gtk_object_unref (GTK_OBJECT (re->edit)); + re->edit = NULL; + } re->dialog = NULL; @@ -364,7 +365,7 @@ rule_edit (GtkWidget *widget, RuleEditor *re) gtk_window_set_default_size (GTK_WINDOW (re->dialog), 600, 400); gtk_window_set_policy (GTK_WINDOW (re->dialog), FALSE, TRUE, FALSE); - gtk_widget_set_parent (re->dialog, GTK_WIDGET (re)); + gtk_widget_set_parent_window (re->dialog, GTK_WIDGET (re)->window); gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (re->dialog)->vbox), rules, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (re->dialog), "clicked", edit_editor_clicked, re); gtk_signal_connect (GTK_OBJECT (re->dialog), "destroy", edit_editor_destroyed, re); -- cgit v1.2.3