[evolution/wip/gsettings] Bug #640706 - Can't edit filter/advance search condition

[Rodrigo Moya <rodrigo src gnome org>]

commit 7a42d829fc4a96421328e65fae3ad47014f4eb61
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jan 27 18:46:25 2011 +0100

    Bug #640706 - Can't edit filter/advance search condition

 filter/e-rule-editor.c            |    4 +---
 mail/em-folder-selection-button.c |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/filter/e-rule-editor.c b/filter/e-rule-editor.c
index 5145c16..59f12de 100644
--- a/filter/e-rule-editor.c
+++ b/filter/e-rule-editor.c
@@ -353,9 +353,7 @@ rule_edit (GtkWidget *widget, ERuleEditor *editor)
 	gtk_window_set_title ((GtkWindow *) editor->dialog, _("Edit Rule"));
 	gtk_window_set_default_size (GTK_WINDOW (editor->dialog), 650, 400);
 	gtk_window_set_resizable (GTK_WINDOW (editor->dialog), TRUE);
-	gtk_widget_set_parent_window (
-		GTK_WIDGET (editor->dialog),
-		gtk_widget_get_window (GTK_WIDGET (editor)));
+	gtk_window_set_transient_for (GTK_WINDOW (editor->dialog), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (editor))));
 	gtk_container_set_border_width ((GtkContainer *) editor->dialog, 6);
 
 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (editor->dialog));
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index fd9e63d..7feed62 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -378,7 +378,7 @@ em_folder_selection_button_init (EMFolderSelectionButton *emfsb)
 	emfsb->priv->label = gtk_label_new ("");
 	gtk_widget_show (emfsb->priv->label);
 	gtk_label_set_justify (GTK_LABEL (emfsb->priv->label), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment (GTK_MISC (emfsb->priv->label), 0.0, 0.0);
+	gtk_misc_set_alignment (GTK_MISC (emfsb->priv->label), 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (box), emfsb->priv->label, TRUE, TRUE, 0);
 
 	gtk_widget_show (box);