From 0fc8b6b1c4b624056c51392e6ef66cc8d9343dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= <romjerome@yahoo.fr>
Date: Tue, 17 Dec 2013 15:14:35 +0100
Subject: [PATCH] 7147 7001: Merge person dialog does not properly adjust
 context section after expand

---
 src/Merge/mergeperson.py    | 2 +-
 src/glade/mergeperson.glade | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Merge/mergeperson.py b/src/Merge/mergeperson.py
index f37d1d54a..4a51b4ad4 100644
--- a/src/Merge/mergeperson.py
+++ b/src/Merge/mergeperson.py
@@ -72,7 +72,7 @@ class MergePeople(ManagedWindow.ManagedWindow):
     Displays a dialog box that allows the persons to be combined into one.
     """
     def __init__(self, dbstate, uistate, handle1, handle2, cb_update=None,
-            expand_context_info=False):
+            expand_context_info=True):
         ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.database = dbstate.db
         self.pr1 = self.database.get_person_from_handle(handle1)
diff --git a/src/glade/mergeperson.glade b/src/glade/mergeperson.glade
index 94e4607ea..fc04c63f3 100644
--- a/src/glade/mergeperson.glade
+++ b/src/glade/mergeperson.glade
@@ -5,6 +5,7 @@
   <object class="GtkDialog" id="mergeperson">
     <property name="modal">True</property>
     <property name="default_width">700</property>
+    <property name="default_height">400</property>
     <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">