callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set 're' as the parent window rather than as the parent widget.

Browse Source 
2002-04-01  Jeffrey Stedfast  <fejj@ximian.com>

	* 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
This commit is contained in:
Jeffrey Stedfast
2002-04-01 23:47:51 +00:00
committed by Jeffrey Stedfast
parent 4ce6a59f74
commit 9b63de40b6
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
filter/ChangeLog
View File

@ -1,3 +1,9 @@
2002-04-01 Jeffrey Stedfast <fejj@ximian.com>
* 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 <fejj@ximian.com>
* filter-source.c (filter_source_get_sources): Free account_name

2
filter/filtertypes.xml
View File

@ -561,7 +561,7 @@
</input>
<input type="source" name="source"/>
</part>
</partset>

13
filter/rule-editor.c
View File

@ -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);