Merge lp:~dobey/ubuntuone-control-panel/no-gb-val into lp:ubuntuone-control-panel

[dobey]

Don't show the "Get NGB free!" label on "Join now" button at all

[Roberto Alsina (ralsina)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good.

review: Approve

=== modified file 'data/gtk/overview.ui'
--- data/gtk/overview.ui	2011-07-11 11:19:09 +0000
+++ data/gtk/overview.ui	2011-09-06 14:30:20 +0000
@@ -251,36 +251,11 @@
                         <property name="use_action_appearance">False</property>
                         <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/>
                         <child>
-                          <object class="GtkVBox" id="vbox4">
+                          <object class="GtkLabel" id="label1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">5</property>
-                            <child>
-                              <object class="GtkLabel" id="label1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;Join now&lt;/span&gt;</property>
-                                <property name="use_markup">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;2GB of free storage&lt;/span&gt;</property>
-                                <property name="use_markup">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;Join now&lt;/span&gt;</property>
+                            <property name="use_markup">True</property>
                           </object>
                         </child>
                       </object>