aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-04-02 07:47:51 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-04-02 07:47:51 +0800
commit9b63de40b6f0f65a1ced9c73ccb8b47d7f34541e (patch)
tree7f8b172111e079d07eda5044b57cc54f6708ca15
parent4ce6a59f74ccc3dbf9e2065e4049bf5749cd08f1 (diff)
downloadgsoc2013-evolution-9b63de40b6f0f65a1ced9c73ccb8b47d7f34541e.tar.gz
gsoc2013-evolution-9b63de40b6f0f65a1ced9c73ccb8b47d7f34541e.tar.zst
gsoc2013-evolution-9b63de40b6f0f65a1ced9c73ccb8b47d7f34541e.zip
Set 're' as the parent window rather than as the parent widget.
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
-rw-r--r--filter/ChangeLog6
-rw-r--r--filter/filtertypes.xml2
-rw-r--r--filter/rule-editor.c13
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 <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
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 @@
</input>
<input type="source" name="source"/>
</part>
-
+
</partset>
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);