From 16b4d2ef273e38bed879c0947c1057f5d7d04567 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 27 Jan 2017 10:54:44 +0100
Subject: [PATCH] use new registration widget

---
 package/yast2-installation.spec                 |  4 ++--
 src/Makefile.am                                 |  1 -
 .../installation/clients/inst_casp_overview.rb  |  5 ++---
 src/lib/installation/widgets/mocked.rb          | 17 -----------------
 4 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 src/lib/installation/widgets/mocked.rb

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
index d1aa15564..43629d9ef 100644
--- a/package/yast2-installation.spec
+++ b/package/yast2-installation.spec
@@ -105,8 +105,8 @@ Conflicts:	yast2-core < 2.17.10
 # Top bar with logo
 Conflicts:	yast2-ycp-ui-bindings < 3.1.7
 
-# RegserviceSelectionDialog
-Conflicts:  yast2-registration < 3.1.179
+# new registration widget
+Conflicts:  yast2-registration <= 3.1.190
 
 Obsoletes:	yast2-installation-devel-doc
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 741a76d67..58d189f7b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -214,7 +214,6 @@ ylibdialog_DATA = \
 
 ylibwidgetdir = "${yast2dir}/lib/installation/widgets"
 ylibwidget_DATA = \
-  lib/installation/widgets/mocked.rb \
   lib/installation/widgets/overview.rb \
   lib/installation/widgets/system_role.rb
 
diff --git a/src/lib/installation/clients/inst_casp_overview.rb b/src/lib/installation/clients/inst_casp_overview.rb
index da4a94ad5..555d36e70 100644
--- a/src/lib/installation/clients/inst_casp_overview.rb
+++ b/src/lib/installation/clients/inst_casp_overview.rb
@@ -23,11 +23,10 @@
 require "y2country/widgets"
 require "ui/widgets"
 require "tune/widgets"
+require "registration/widgets/registration_code"
 
 require "installation/widgets/overview"
 require "installation/widgets/system_role"
-# FIXME: prototype only
-require "installation/widgets/mocked"
 
 module Installation
   # This library provides a simple dialog for setting
@@ -125,7 +124,7 @@ def content
       dashboard = Installation::Widgets::DashboardPlace.new
       quadrant_layout(
         upper_left:  VBox(
-          ::Widgets::RegistrationCode.new,
+          ::Registration::Widgets::RegistrationCode.new,
           ::Users::PasswordWidget.new(little_space: true),
           # use english us as default keyboard layout
           ::Y2Country::Widgets::KeyboardSelectionCombo.new("english-us")
diff --git a/src/lib/installation/widgets/mocked.rb b/src/lib/installation/widgets/mocked.rb
deleted file mode 100644
index 503207e59..000000000
--- a/src/lib/installation/widgets/mocked.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "yast"
-require "cwm/widget"
-
-# FIXME: these are mock only
-
-# move this to: yast2-registration
-module Widgets
-  class RegistrationCode < CWM::InputField
-    def initialize
-      textdomain "FIXME"
-    end
-
-    def label
-      _("Registration Code or SMT Server URL")
-    end
-  end
-end