[gnome-boxes] Move remove_disk_from_domain_config to UnattendedInstaller



commit 26423c592105d0443df6186d83f2f8b03a035085
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Thu Dec 27 16:27:59 2012 +0100

    Move remove_disk_from_domain_config to UnattendedInstaller
    
    InstallerMedia no longer uses it after the previous commit.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=690775

 src/installer-media.vala      |   17 -----------------
 src/unattended-installer.vala |   17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/installer-media.vala b/src/installer-media.vala
index 3867ffe..05a43d1 100644
--- a/src/installer-media.vala
+++ b/src/installer-media.vala
@@ -121,23 +121,6 @@ private class Boxes.InstallerMedia : GLib.Object {
         domain.add_device (disk);
     }
 
-    protected void remove_disk_from_domain_config (Domain domain, string disk_path) {
-        var devices = domain.get_devices ();
-        foreach (var device in devices) {
-            if (!(device is DomainDisk))
-                continue;
-
-            var disk = device as DomainDisk;
-            if (disk.get_source () == disk_path) {
-                devices.remove (device);
-
-                break;
-            }
-        }
-
-        domain.set_devices (devices);
-    }
-
     private async GUdev.Device? get_device_from_path (string path, Client client, Cancellable? cancellable) {
         try {
             var mount_dir = File.new_for_commandline_arg (path);
diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
index 6ed38be..323641e 100644
--- a/src/unattended-installer.vala
+++ b/src/unattended-installer.vala
@@ -720,4 +720,21 @@ private class Boxes.UnattendedInstaller: InstallerMedia {
 
         return system_langs[0];
     }
+
+    private void remove_disk_from_domain_config (Domain domain, string disk_path) {
+        var devices = domain.get_devices ();
+        foreach (var device in devices) {
+            if (!(device is DomainDisk))
+                continue;
+
+            var disk = device as DomainDisk;
+            if (disk.get_source () == disk_path) {
+                devices.remove (device);
+
+                break;
+            }
+        }
+
+        domain.set_devices (devices);
+    }
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]