Merge pull request #53 from ancorgs/reload_flag

Adapt to the API changes in UI::ServicesStatus
yast · Nov 27, 2015 · f88659c · f88659c
2 parents b51da6d + f6837f0
commit f88659c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/package/yast2-dns-server.changes b/package/yast2-dns-server.changes
@@ -1,7 +1,14 @@
+-------------------------------------------------------------------
+Fri Nov 27 09:35:39 UTC 2015 - ancor@suse.com
+
+- Adapted to latest changes in UI::ServiceStatus API (fate#318771)
+- 3.1.19
+
 -------------------------------------------------------------------
 Thu Nov 26 08:56:08 UTC 2015 - ancor@suse.com
 
 - Use new version of the UI component for services handling
+  (fate#318771)
 - 3.1.18
 
 -------------------------------------------------------------------

diff --git a/package/yast2-dns-server.spec b/package/yast2-dns-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dns-server
-Version:        3.1.18
+Version:        3.1.19
 Release:        0
 Url:            https://github.com/yast/yast-dns-server
 
@@ -34,7 +34,7 @@ BuildRequires:  yast2-perl-bindings
 BuildRequires:  yast2-testsuite
 
 # UI::ServiceStatus
-BuildRequires:  yast2 >= 3.1.160
+BuildRequires:  yast2 >= 3.1.161
 Requires:       /usr/bin/host
 Requires:       perl-gettext
 # Exporter Data::Dumper
@@ -56,7 +56,7 @@ Requires:       sed
 Requires:       yast2-sysconfig
 
 # UI::ServiceStatus
-Requires:       yast2 >= 3.1.160
+Requires:       yast2 >= 3.1.161
 
 BuildArch:      noarch
 

diff --git a/src/include/dns-server/dialog-main.rb b/src/include/dns-server/dialog-main.rb
@@ -535,8 +535,8 @@ def HandleStartUp(_key, event)
       if event_id == "apply"
         SaveAndRestart()
       else
-        if @status_widget.handle_input(event_id) == :enabled_changed
-          DnsServer.SetStartService(@status_widget.enabled?)
+        if @status_widget.handle_input(event_id) == :enabled_flag
+          DnsServer.SetStartService(@status_widget.enabled_flag?)
         end
       end
       nil
@@ -2147,7 +2147,7 @@ def WriteDialog
       Wizard.RestoreHelp(Ops.get_string(@HELPS, "write", ""))
       ret = DnsServer.Write
       if ret
-        @service.reload if @status_widget.reload?
+        @service.reload if @status_widget.reload_flag?
         :next
       else
         if Popup.YesNo(_("Saving the configuration failed. Change the settings?"))
@@ -2164,7 +2164,7 @@ def SaveAndRestart
       Wizard.RestoreHelp(Ops.get_string(@HELPS, "write", ""))
       ret = DnsServer.Write
       if ret
-        @service.reload if @status_widget.reload?
+        @service.reload if @status_widget.reload_flag?
       else
         Report.Error(_("Saving the configuration failed"))
       end