[evolution/gnome-3-10] Bug #707121 - Merge contacts dialogs indefinitely expands by itself

[Milan Crha <mcrha src gnome org>]

commit 75938b57f648b2402dd67b50ac01c6925dacd73c
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jan 24 14:13:55 2014 +0100

    Bug #707121 - Merge contacts dialogs indefinitely expands by itself

 .../eab-contact-commit-duplicate-detected.ui       |   28 ++-
 .../gui/merging/eab-contact-duplicate-detected.ui  |  284 ++++++++++----------
 2 files changed, 169 insertions(+), 143 deletions(-)
---
diff --git a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui 
b/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui
index 04ed728..a1cf8a5 100644
--- a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui
+++ b/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui
@@ -57,8 +57,18 @@
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
-              <object class="EABContactDisplay" type-func="eab_contact_display_get_type" 
id="custom-old-contact">
-                <property name="visible">True</property>
+             <object class="GtkScrolledWindow" id="scrolled-old-contact">
+               <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+               <child>
+                  <object class="EABContactDisplay" type-func="eab_contact_display_get_type" 
id="custom-old-contact">
+                    <property name="visible">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -135,8 +145,18 @@
               </packing>
             </child>
             <child>
-              <object class="EABContactDisplay" type-func="eab_contact_display_get_type" 
id="custom-new-contact">
-                <property name="visible">True</property>
+             <object class="GtkScrolledWindow" id="scrolled-new-contact">
+               <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+               <child>
+                  <object class="EABContactDisplay" type-func="eab_contact_display_get_type" 
id="custom-new-contact">
+                    <property name="visible">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/addressbook/gui/merging/eab-contact-duplicate-detected.ui 
b/addressbook/gui/merging/eab-contact-duplicate-detected.ui
index 124b9c2..050448e 100644
--- a/addressbook/gui/merging/eab-contact-duplicate-detected.ui
+++ b/addressbook/gui/merging/eab-contact-duplicate-detected.ui
@@ -67,146 +67,152 @@
           </packing>
         </child>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow2">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="shadow_type">GTK_SHADOW_IN</property>
-            <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-            <child>
-              <object class="GtkViewport" id="viewport1">
-                <child>
-                  <object class="GtkTable" id="table1">
-                    <property name="border_width">12</property>
-                    <property name="visible">True</property>
-                    <property name="n_rows">5</property>
-                    <property name="n_columns">2</property>
-                    <property name="homogeneous">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="EABContactDisplay" type-func="eab_contact_display_get_type" 
id="custom-old-contact">
-                        <property name="visible">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">The name or email address of this contact 
already exists
+         <object class="GtkTable" id="table1">
+           <property name="border_width">12</property>
+           <property name="visible">True</property>
+           <property name="n_rows">5</property>
+           <property name="n_columns">2</property>
+           <property name="homogeneous">False</property>
+           <property name="row_spacing">6</property>
+           <property name="column_spacing">12</property>
+           <child>
+             <object class="GtkScrolledWindow" id="scrolled-old-contact">
+               <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+               <child>
+                  <object class="EABContactDisplay" type-func="eab_contact_display_get_type" 
id="custom-old-contact">
+                   <property name="visible">True</property>
+                 </object>
+               </child>
+             </object>
+             <packing>
+               <property name="left_attach">1</property>
+               <property name="right_attach">2</property>
+               <property name="top_attach">4</property>
+               <property name="bottom_attach">5</property>
+             </packing>
+           </child>
+           <child>
+             <object class="GtkLabel" id="label1">
+               <property name="visible">True</property>
+               <property name="label" translatable="yes">The name or email address of this contact already 
exists
 in this folder.  Would you like to add it anyway?</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">0</property>
-                        <property name="bottom_attach">1</property>
-                        <property name="y_options">fill</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Original Contact:</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                        <property name="y_options">fill</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">New Contact:</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options"/>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="EABContactDisplay" type-func="eab_contact_display_get_type" 
id="custom-new-contact">
-                        <property name="visible">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment1">
-                        <property name="visible">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0</property>
-                        <property name="xscale">1</property>
-                        <property name="yscale">0</property>
-                        <property name="top_padding">0</property>
-                        <property name="bottom_padding">0</property>
-                        <property name="left_padding">0</property>
-                        <property name="right_padding">0</property>
-                        <child>
-                          <object class="GtkImage" id="custom2">
-                            <property name="visible">True</property>
-                            <property name="icon-name">avatar-default</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="right_attach">1</property>
-                        <property name="top_attach">0</property>
-                        <property name="bottom_attach">5</property>
-                        <property name="x_options">fill</property>
-                        <property name="y_options">fill</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
+               <property name="use_underline">False</property>
+               <property name="use_markup">False</property>
+               <property name="justify">GTK_JUSTIFY_LEFT</property>
+               <property name="wrap">False</property>
+               <property name="selectable">False</property>
+               <property name="xalign">0</property>
+               <property name="yalign">0.5</property>
+               <property name="xpad">0</property>
+               <property name="ypad">0</property>
+             </object>
+             <packing>
+               <property name="left_attach">1</property>
+               <property name="right_attach">2</property>
+               <property name="top_attach">0</property>
+               <property name="bottom_attach">1</property>
+               <property name="y_options">fill</property>
+             </packing>
+           </child>
+           <child>
+             <object class="GtkLabel" id="label3">
+               <property name="visible">True</property>
+               <property name="label" translatable="yes">Original Contact:</property>
+               <property name="use_underline">False</property>
+               <property name="use_markup">False</property>
+               <property name="justify">GTK_JUSTIFY_CENTER</property>
+               <property name="wrap">False</property>
+               <property name="selectable">False</property>
+               <property name="xalign">0</property>
+               <property name="yalign">0.5</property>
+               <property name="xpad">0</property>
+               <property name="ypad">0</property>
+             </object>
+             <packing>
+               <property name="left_attach">1</property>
+               <property name="right_attach">2</property>
+               <property name="top_attach">3</property>
+               <property name="bottom_attach">4</property>
+               <property name="y_options">fill</property>
+             </packing>
+           </child>
+           <child>
+             <object class="GtkLabel" id="label4">
+               <property name="visible">True</property>
+               <property name="label" translatable="yes">New Contact:</property>
+               <property name="use_underline">False</property>
+               <property name="use_markup">False</property>
+               <property name="justify">GTK_JUSTIFY_CENTER</property>
+               <property name="wrap">False</property>
+               <property name="selectable">False</property>
+               <property name="xalign">0</property>
+               <property name="yalign">0.5</property>
+               <property name="xpad">0</property>
+               <property name="ypad">0</property>
+             </object>
+             <packing>
+               <property name="left_attach">1</property>
+               <property name="right_attach">2</property>
+               <property name="top_attach">1</property>
+               <property name="bottom_attach">2</property>
+               <property name="x_options">fill</property>
+               <property name="y_options"/>
+             </packing>
+           </child>
+           <child>
+             <object class="GtkScrolledWindow" id="scrolled-new-contact">
+               <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+               <child>
+                 <object class="EABContactDisplay" type-func="eab_contact_display_get_type" 
id="custom-new-contact">
+                   <property name="visible">True</property>
+                 </object>
+               </child>
+             </object>
+             <packing>
+               <property name="left_attach">1</property>
+               <property name="right_attach">2</property>
+               <property name="top_attach">2</property>
+               <property name="bottom_attach">3</property>
+             </packing>
+           </child>
+           <child>
+             <object class="GtkAlignment" id="alignment1">
+               <property name="visible">True</property>
+               <property name="xalign">0.5</property>
+               <property name="yalign">0</property>
+               <property name="xscale">1</property>
+               <property name="yscale">0</property>
+               <property name="top_padding">0</property>
+               <property name="bottom_padding">0</property>
+               <property name="left_padding">0</property>
+               <property name="right_padding">0</property>
+               <child>
+                 <object class="GtkImage" id="custom2">
+                   <property name="visible">True</property>
+                   <property name="icon-name">avatar-default</property>
+                 </object>
+               </child>
+             </object>
+             <packing>
+               <property name="left_attach">0</property>
+               <property name="right_attach">1</property>
+               <property name="top_attach">0</property>
+               <property name="bottom_attach">5</property>
+               <property name="x_options">fill</property>
+               <property name="y_options">fill</property>
+             </packing>
+           </child>
+         </object>
         </child>
       </object>
     </child>