Merge lp:~xnox/ubiquity/no-m-a into lp:ubiquity

[Dimitri John Ledkov]

[lp:~xnox/ubiquity/no-m-a]

5493. By Dimitri John Ledkov on 2012-05-28

Remove migration-assistant's UI definitions.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-28 10:55:39 +0000
+++ debian/changelog	2012-05-28 14:40:25 +0000
@@ -1,8 +1,12 @@
 ubiquity (2.11.4) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Force the locale to en_US.UTF-8 for the timezone tests.
 
- -- Colin Watson <[e-mail]>  Mon, 28 May 2012 11:55:01 +0100
+  [ Dmitrijs Ledkovs ]
+  * Remove migration-assistant's UI definitions.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Mon, 28 May 2012 15:35:55 +0100
 
 ubiquity (2.11.3) quantal; urgency=low
 

=== removed file 'gui/gtk/stepMigrationAssistant.ui'
--- gui/gtk/stepMigrationAssistant.ui	2012-03-06 00:28:03 +0000
+++ gui/gtk/stepMigrationAssistant.ui	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkBox" id="stepMigrationAssistant">
-    <property name="visible">True</property>
-    <property name="border_width">6</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkLabel" id="ma_text_label">
-        <property name="width_request">600</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">Select any accounts you would like to import.  The documents and settings for these accounts will be available after the install completes.
-
-If you do not wish to import any accounts, select nothing and go to the next page.</property>
-        <property name="wrap">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="padding">6</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment7">
-        <property name="visible">True</property>
-        <property name="xscale">0.5</property>
-        <property name="yscale">0.80000001192092896</property>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow9">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkTreeView" id="matreeview">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="headers_visible">False</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="matreeview-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Account List</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-</interface>