[gnome-boxes/wip/clone: 2/3] LibvirtSystemMedia -> LibvirtMedia



commit 46390f8a6199012d31d5fffa3a03f431c37ca30d
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu Apr 28 15:37:19 2016 +0100

    LibvirtSystemMedia -> LibvirtMedia
    
    Renaming for exactly the same reason as the previous commit
    (LibvirtSystemVMImporter -> LibvirtVMImporter).

 src/Makefile.am                                    |    2 +-
 ...ibvirt-system-media.vala => libvirt-media.vala} |    4 ++--
 src/libvirt-system-importer.vala                   |    2 +-
 src/libvirt-vm-importer.vala                       |    4 ++--
 src/media-manager.vala                             |    2 +-
 src/vm-configurator.vala                           |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c90c814..407c58d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,7 +115,7 @@ gnome_boxes_SOURCES =                               \
        installer-media.vala                    \
        installed-media.vala                    \
        keys-input-popover.vala                 \
-       libvirt-system-media.vala               \
+       libvirt-media.vala                      \
        iso-extractor.vala                      \
        libvirt-broker.vala                     \
        libvirt-machine.vala                    \
diff --git a/src/libvirt-system-media.vala b/src/libvirt-media.vala
similarity index 83%
rename from src/libvirt-system-media.vala
rename to src/libvirt-media.vala
index 3b178f8..7e9d0b3 100644
--- a/src/libvirt-system-media.vala
+++ b/src/libvirt-media.vala
@@ -2,7 +2,7 @@
 
 using GVirConfig;
 
-private class Boxes.LibvirtSystemMedia : Boxes.InstalledMedia {
+private class Boxes.LibvirtMedia : Boxes.InstalledMedia {
     protected override string? architecture {
         owned get {
             return domain_config.get_os ().get_arch ();
@@ -11,7 +11,7 @@ private class Boxes.LibvirtSystemMedia : Boxes.InstalledMedia {
 
     public Domain domain_config { get; private set; }
 
-    public LibvirtSystemMedia (string path, Domain domain_config) throws GLib.Error {
+    public LibvirtMedia (string path, Domain domain_config) throws GLib.Error {
         base (path);
 
         this.domain_config = domain_config;
diff --git a/src/libvirt-system-importer.vala b/src/libvirt-system-importer.vala
index b273b47..1014f95 100644
--- a/src/libvirt-system-importer.vala
+++ b/src/libvirt-system-importer.vala
@@ -99,7 +99,7 @@ private class Boxes.LibvirtSystemImporter: GLib.Object {
         debug ("Importing '%s' from system libvirt..", config.name);
 
         try {
-            var media = new LibvirtSystemMedia (disk_path, config);
+            var media = new LibvirtMedia (disk_path, config);
             var vm_importer = media.get_vm_creator ();
             var machine = yield vm_importer.create_vm (cancellable);
             vm_importer.launch_vm (machine);
diff --git a/src/libvirt-vm-importer.vala b/src/libvirt-vm-importer.vala
index 8e633a7..a1363c2 100644
--- a/src/libvirt-vm-importer.vala
+++ b/src/libvirt-vm-importer.vala
@@ -15,7 +15,7 @@ private class Boxes.LibvirtVMImporter : Boxes.VMImporter {
     }
 
     protected override void create_domain_base_name_and_title (out string base_name, out string base_title) {
-        var media = install_media as LibvirtSystemMedia;
+        var media = install_media as LibvirtMedia;
 
         base_name = media.domain_config.name;
         base_title = media.domain_config.title?? base_name;
@@ -25,7 +25,7 @@ private class Boxes.LibvirtVMImporter : Boxes.VMImporter {
                                                           string          title,
                                                           GVir.StorageVol volume,
                                                           Cancellable?    cancellable) throws GLib.Error {
-        var media = install_media as LibvirtSystemMedia;
+        var media = install_media as LibvirtMedia;
         var config = media.domain_config;
 
         config.name = name;
diff --git a/src/media-manager.vala b/src/media-manager.vala
index 59842c7..88803b3 100644
--- a/src/media-manager.vala
+++ b/src/media-manager.vala
@@ -43,7 +43,7 @@ private class Boxes.MediaManager : Object {
             if (VMConfigurator.is_import_config (config))
                 return yield new InstalledMedia.guess_os (path, this);
             else if (VMConfigurator.is_libvirt_system_import_config (config))
-                return new LibvirtSystemMedia (path, config);
+                return new LibvirtMedia (path, config);
         } catch (GLib.Error error) {
                 debug ("%s", error.message);
 
diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
index 9548e63..d39456f 100644
--- a/src/vm-configurator.vala
+++ b/src/vm-configurator.vala
@@ -418,7 +418,7 @@ private class Boxes.VMConfigurator {
 
         if (installed)
             custom_xml = INSTALLED_XML;
-        else if (install_media is LibvirtSystemMedia)
+        else if (install_media is LibvirtMedia)
             custom_xml = LIBVIRT_SYS_IMPORT_XML;
         else if (install_media is InstalledMedia)
             custom_xml = IMPORT_XML;


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