From: Matthew Fischer <matthew.fischer@canonical.com>
Description: Fix several UI layout issues and incorrect tool-tips.
 This change fixes numerous UI layout issues, including invalid tool-tips,
 lack of space to display information, and UI elements that resized when
 they should not.

Bug: https://bugzilla.gnome.org/654117
Bug: https://bugzilla.gnome.org/577790
Bug: https://bugzilla.gnome.org/661772
Bug-Ubuntu: https://launchpad.net/bugs/891852
Bug-Ubuntu: https://launchpad.net/bugs/806606
Bug-Ubuntu: https://launchpad.net/bugs/841007
Bug-Ubuntu: https://launchpad.net/bugs/389153

---
Index: gnome-nettool-3.0.0/data/gnome-nettool.ui
===================================================================
--- gnome-nettool-3.0.0.orig/data/gnome-nettool.ui	2011-12-03 22:49:53.034613680 -0700
+++ gnome-nettool-3.0.0/data/gnome-nettool.ui	2011-12-03 22:49:51.578613724 -0700
@@ -282,6 +282,7 @@
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow8">
+                            <property name="height_request">120</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="border_width">6</property>
@@ -290,7 +291,6 @@
                             <property name="shadow_type">GTK_SHADOW_IN</property>
                             <child>
                               <object class="GtkTreeView" id="info_list_ip_addr">
-                                <property name="height_request">120</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="rules_hint">True</property>
@@ -1045,6 +1045,11 @@
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -1381,9 +1386,12 @@
                 </child>
                 <child>
                   <object class="GtkDrawingArea" id="ping_graph">
+                    <property name="height_request">160</property>
                     <property name="visible">True</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
@@ -1393,6 +1401,7 @@
                     <property name="can_focus">True</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow">
+                        <property name="height_request">160</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="border_width">6</property>
@@ -1417,7 +1426,7 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="pack_type">GTK_PACK_END</property>
                     <property name="position">1</property>
                   </packing>
@@ -1514,7 +1523,10 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="padding">4</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1562,9 +1574,16 @@
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -1599,6 +1618,8 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1648,7 +1669,7 @@
                             <child internal-child="entry">
                               <object class="GtkEntry" id="comboboxentry-entry2">
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Enter the network address to scan for open ports. For example: www.domain.com or 192.168.2.1</property>
+                                <property name="tooltip_text" translatable="yes">Enter the network address to trace a route to. For example: www.domain.com or 192.168.2.1</property>
                                 <accessibility>
                                   <relation target="traceroute_host_label" type="labelled-by"/>
                                 </accessibility>
@@ -1750,6 +1771,8 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1908,6 +1931,8 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1976,7 +2001,7 @@
                             <child internal-child="entry">
                               <object class="GtkEntry" id="comboboxentry-entry4">
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Enter the network address to lookup. For example: www.domain.com or 192.168.2.1</property>
+                                <property name="tooltip_text" translatable="yes">Enter the domain to lookup. For example: domain.com or ftp.domain.com.</property>
                                 <accessibility>
 
                                 </accessibility>
@@ -2064,9 +2089,16 @@
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -2100,6 +2132,8 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -2278,9 +2312,16 @@
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -2315,6 +2356,8 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -2473,6 +2516,8 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
