[gnome-boxes] machine: Status in 'status' prop, not 'info'

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit a131e950361156e52ce7967fc2ea813dca8a03f7
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri Aug 28 17:20:21 2015 +0100

    machine: Status in 'status' prop, not 'info'
    
    Since 'info' property is bound to 2nd text line under the box thumbnail,
    we have been (ab)using this property to keep status messages too. We
    already have a 'status' property for those and that is where these
    messages should go into.
    
    With this patch, these status messages will no longer appear under the
    box thumbnail but this is a temporary regression that will be fixed in a
    following patch.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753888

 src/libvirt-machine.vala |   22 ++++++++++++++--------
 src/machine.vala         |   10 +++++-----
 src/ovirt-machine.vala   |    7 +------
 src/remote-machine.vala  |    7 +------
 4 files changed, 21 insertions(+), 25 deletions(-)
---
diff --git a/src/libvirt-machine.vala b/src/libvirt-machine.vala
index 5f38784..d9ec8a1 100644
--- a/src/libvirt-machine.vala
+++ b/src/libvirt-machine.vala
@@ -212,7 +212,7 @@ private class Boxes.LibvirtMachine: Boxes.Machine {
             state = MachineState.SLEEPING;
         });
         notify["state"].connect (() => {
-            update_info ();
+            update_status ();
 
             if (state == MachineState.RUNNING) {
                 reconnect_display ();
@@ -234,6 +234,7 @@ private class Boxes.LibvirtMachine: Boxes.Machine {
             warning ("Failed to connection to system libvirt: %s", error.message);
         }
 
+        update_status ();
         update_info ();
         source.notify["uri"].connect (update_info);
 
@@ -719,19 +720,24 @@ private class Boxes.LibvirtMachine: Boxes.Machine {
         connecting_cancellable.disconnect (cancelled_id);
     }
 
-    protected override void update_info () {
-        base.update_info ();
+    protected override void update_status () {
+        base.update_status ();
 
-        if (info != null)
+        if (status != null)
             return;
 
         if (VMConfigurator.is_install_config (domain_config))
-            info = _("Installing…");
+            status = _("Installing…");
         else if (VMConfigurator.is_live_config (domain_config))
-            info = _("Live");
+            status = _("Live");
         else if (VMConfigurator.is_import_config (domain_config))
-            info = _("Importing…");
-        else if (!is_local) {
+            status = _("Importing…");
+        else
+            status = null;
+    }
+
+    private void update_info () {
+        if (!is_local) {
             var uri = Xml.URI.parse (source.uri);
 
             info = _("host: %s").printf (uri.server);
diff --git a/src/machine.vala b/src/machine.vala
index 2e3e9a7..5fd978a 100644
--- a/src/machine.vala
+++ b/src/machine.vala
@@ -307,13 +307,13 @@ private abstract class Boxes.Machine: Boxes.CollectionItem, Boxes.IPropertiesPro
         }
 
         saving = true;
-        update_info ();
+        update_status ();
 
         try {
             yield save_real ();
         } finally {
             saving = false;
-            update_info ();
+            update_status ();
         }
     }
 
@@ -407,11 +407,11 @@ private abstract class Boxes.Machine: Boxes.CollectionItem, Boxes.IPropertiesPro
         config.save ();
     }
 
-    protected virtual void update_info () {
+    protected virtual void update_status () {
         if (saving)
-            info = _("Saving…");
+            status = _("Saving…");
         else
-            info = null;
+            status = null;
     }
 
     private void save_pixbuf_as_screenshot (Gdk.Pixbuf? pixbuf) {
diff --git a/src/ovirt-machine.vala b/src/ovirt-machine.vala
index ebe5068..eb22c32 100644
--- a/src/ovirt-machine.vala
+++ b/src/ovirt-machine.vala
@@ -78,12 +78,7 @@ private class Boxes.OvirtMachine: Boxes.Machine {
 
     public override void restart () {} // See FIXME on RemoteMachine.restart
 
-    protected override void update_info () {
-        base.update_info ();
-
-        if (info != null)
-            return;
-
+    private void update_info () {
         var uri = Xml.URI.parse (source.uri);
 
         info = _("host: %s").printf (uri.server);
diff --git a/src/remote-machine.vala b/src/remote-machine.vala
index 6e61b7a..4ef438f 100644
--- a/src/remote-machine.vala
+++ b/src/remote-machine.vala
@@ -98,12 +98,7 @@ private class Boxes.RemoteMachine: Boxes.Machine, Boxes.IPropertiesProvider {
     //        restart and this method is currently used for that purpose only.
     public override void restart () {}
 
-    protected override void update_info () {
-        base.update_info ();
-
-        if (info != null)
-            return;
-
+    private void update_info () {
         var uri = Xml.URI.parse (source.uri);
         if (uri == null || uri.server == name) // By default server is chosen as name
             return;