1 files changed, 9 insertions, 16 deletions

diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index f9350ea372..b6056b3777 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -253,10 +253,8 @@ add_editor_clicked (GtkWidget *dialog, int button, RuleEditor *re)
 	default:
 		gnome_dialog_close (GNOME_DIALOG (dialog));
 	case -1:
-                if (re->edit) {
-                        gtk_object_unref (GTK_OBJECT (re->edit));
-			re->edit = NULL;
-		}
+		gtk_object_unref (GTK_OBJECT (re->edit));
+		re->edit = NULL;
 		
 		re->dialog = NULL;
 		
@@ -329,10 +327,8 @@ edit_editor_clicked (GtkWidget *dialog, int button, RuleEditor *re)
 	default:
 		gnome_dialog_close (GNOME_DIALOG (dialog));
 	case -1:
-		if (re->edit) {
-			gtk_object_unref (GTK_OBJECT (re->edit));
-			re->edit = NULL;
-		}
+		gtk_object_unref (GTK_OBJECT (re->edit));
+		re->edit = NULL;
 		
 		re->dialog = NULL;
 		
@@ -363,9 +359,9 @@ rule_edit (GtkWidget *widget, RuleEditor *re)
 				       GNOME_STOCK_BUTTON_CANCEL,
 				       NULL);
 	
-	gnome_dialog_set_parent (GNOME_DIALOG (re->dialog), GTK_WINDOW (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_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);
@@ -385,7 +381,7 @@ rule_delete (GtkWidget *widget, RuleEditor *re)
 	d(printf ("delete rule\n"));
 	pos = rule_context_get_rank_rule (re->context, re->current, re->source);
 	if (pos != -1) {
-		int len;
+		gint len;
 		
 		rule_context_remove_rule (re->context, re->current);
 		
@@ -393,7 +389,7 @@ rule_delete (GtkWidget *widget, RuleEditor *re)
 		l = g_list_append (NULL, item);
 		gtk_list_remove_items (re->list, l);
 		g_list_free (l);
-		
+
 		rule_editor_add_undo(re, RULE_EDITOR_LOG_REMOVE, re->current, rule_context_get_rank_rule(re->context, re->current, re->current->source), 0);
 #if 0		
 		gtk_object_unref (GTK_OBJECT (re->current));
@@ -496,13 +492,11 @@ select_rule (GtkWidget *w, GtkWidget *child, RuleEditor *re)
 	rule_editor_set_sensitive (re);
 }
 
-static gboolean
+static void
 double_click (GtkWidget *widget, GdkEventButton *event, RuleEditor *re)
 {
 	if (re->current && event->type == GDK_2BUTTON_PRESS)
 		rule_edit (widget, re);
-	
-	return TRUE;
 }
 
 static void
@@ -643,8 +637,7 @@ rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, cons
 	
         re->list = (GtkList *) w = glade_xml_get_widget(gui, "rule_list");
 	gtk_signal_connect (GTK_OBJECT (w), "select_child", select_rule, re);
-	gtk_signal_connect (GTK_OBJECT (w), "button_press_event",
-			    GTK_SIGNAL_FUNC (double_click), re);
+	gtk_signal_connect (GTK_OBJECT (w), "button_press_event", double_click, re);
 
 	gtk_signal_connect (GTK_OBJECT (re), "clicked", editor_clicked, re);
 	rule_editor_set_source (re, source);