From 729823612ec4ba49a6feedc919717df93897adec Mon Sep 17 00:00:00 2001
From: Michiel Nauta <m.d.nauta@hetnet.nl>
Date: Sun, 3 Jun 2012 20:11:39 +0000
Subject: [PATCH] 5809: Multisurname editor impossibly narrow

svn: r19747
---
 src/GrampsLogger/_ErrorView.py | 1 +
 src/Merge/mergenote.py         | 2 ++
 src/gui/editors/editperson.py  | 9 +++------
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/GrampsLogger/_ErrorView.py b/src/GrampsLogger/_ErrorView.py
index 1accc503e..c2e55968d 100644
--- a/src/GrampsLogger/_ErrorView.py
+++ b/src/GrampsLogger/_ErrorView.py
@@ -120,6 +120,7 @@ class ErrorView(object):
         
         scroll = gtk.ScrolledWindow()
         scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        scroll.set_size_request(-1, 60)
         
         tb_frame.add(scroll)
         scroll.add_with_viewport(tb_label)
diff --git a/src/Merge/mergenote.py b/src/Merge/mergenote.py
index 1d2226e40..4531605e7 100644
--- a/src/Merge/mergenote.py
+++ b/src/Merge/mergenote.py
@@ -76,11 +76,13 @@ class MergeNotes(ManagedWindow.ManagedWindow):
         tb1 = StyledTextBuffer()
         tv1.set_buffer(tb1)
         tb1.set_text(text1)
+        tv1.set_size_request(-1, 60)
         text2 = self.no2.get_styledtext()
         tv2 = self.get_widget("text2")
         tb2 = StyledTextBuffer()
         tv2.set_buffer(tb2)
         tb2.set_text(text2)
+        tv2.set_size_request(-1, 60)
         if text1 == text2:
             for widget_name in ('text1', 'text2', 'text_btn1', 'text_btn2'):
                 self.get_widget(widget_name).set_sensitive(False)
diff --git a/src/gui/editors/editperson.py b/src/gui/editors/editperson.py
index 4d7a3fffa..ad92a452e 100644
--- a/src/gui/editors/editperson.py
+++ b/src/gui/editors/editperson.py
@@ -549,12 +549,7 @@ class EditPerson(EditPrimary):
             self.pname.get_primary_surname().set_origintype,
             self.pname.get_primary_surname().get_origintype)
 
-        #remove present surname tab, and put new one based on current prim name
-        msurhbox = self.top.get_object("hboxmultsurnames")
-        msurhbox.remove(self.surntab)
-        self.surntab = SurnameTab(self.dbstate, self.uistate, self.track,
-                       self.obj.get_primary_name())
-        msurhbox.pack_start(self.surntab)
+        self.__renewmultsurnames()
 
         if len(self.pname.get_surname_list()) == 1:
             self.singlesurn_active = True
@@ -901,6 +896,8 @@ class EditPerson(EditPrimary):
         msurhbox.remove(self.surntab)
         self.surntab = SurnameTab(self.dbstate, self.uistate, self.track,
                        self.obj.get_primary_name())
+        self.multsurnfr.set_size_request(-1,
+                                int(config.get('interface.surname-box-height')))
         msurhbox.pack_start(self.surntab)
 
     def load_person_image(self):