[gnome-boxes] remote-machine: Move 'Protocol' to 'General' section

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 450a0b18458ddfcd84be8f017d7e2f666998c203
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Sat Nov 8 21:53:35 2014 +0000

    remote-machine: Move 'Protocol' to 'General' section
    
    Designers (jimmac and aday) want to ditch the 'Display' section, so we
    need to move this to 'General' section before we do that.

 src/libvirt-machine-properties.vala |    9 +++------
 src/ovirt-machine.vala              |    5 +----
 src/remote-machine.vala             |    5 +----
 3 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/src/libvirt-machine-properties.vala b/src/libvirt-machine-properties.vala
index de382e2..02caa72 100644
--- a/src/libvirt-machine-properties.vala
+++ b/src/libvirt-machine-properties.vala
@@ -131,8 +131,10 @@ private class Boxes.LibvirtMachineProperties: GLib.Object, Boxes.IPropertiesProv
             });
 
             add_string_property (ref list, _("Virtualizer"), machine.source.uri);
-            if (machine.display != null)
+            if (machine.display != null) {
+                add_string_property (ref list, _("Protocol"), machine.display.protocol);
                 property = add_string_property (ref list, _("URI"), machine.display.uri);
+            }
             break;
 
         case PropertiesPage.SYSTEM:
@@ -201,11 +203,6 @@ private class Boxes.LibvirtMachineProperties: GLib.Object, Boxes.IPropertiesProv
             });
             break;
 
-        case PropertiesPage.DISPLAY:
-            if (machine.display != null)
-                add_string_property (ref list, _("Protocol"), machine.display.protocol);
-            break;
-
         case PropertiesPage.DEVICES:
             foreach (var device_config in machine.domain_config.get_devices ()) {
                 if (!(device_config is GVirConfig.DomainDisk))
diff --git a/src/ovirt-machine.vala b/src/ovirt-machine.vala
index 9cbb260..a41dd0f 100644
--- a/src/ovirt-machine.vala
+++ b/src/ovirt-machine.vala
@@ -62,11 +62,8 @@ private class Boxes.OvirtMachine: Boxes.Machine {
         switch (page) {
         case PropertiesPage.GENERAL:
             add_string_property (ref list, _("Virtualizer"), source.uri);
-            add_string_property (ref list, _("URI"), display.uri);
-            break;
-
-        case PropertiesPage.DISPLAY:
             add_string_property (ref list, _("Protocol"), display.protocol);
+            add_string_property (ref list, _("URI"), display.uri);
             break;
         }
 
diff --git a/src/remote-machine.vala b/src/remote-machine.vala
index bad823b..1007cba 100644
--- a/src/remote-machine.vala
+++ b/src/remote-machine.vala
@@ -62,6 +62,7 @@ private class Boxes.RemoteMachine: Boxes.Machine, Boxes.IPropertiesProvider {
                 name_property.text = name;
             });
 
+            add_string_property (ref list, _("Protocol"), source.source_type.up ());
             property = add_string_property (ref list, _("URI"), source.uri);
             if (!is_connected ())
                 property.editable = true;
@@ -71,10 +72,6 @@ private class Boxes.RemoteMachine: Boxes.Machine, Boxes.IPropertiesProvider {
             });
 
             break;
-
-        case PropertiesPage.DISPLAY:
-            add_string_property (ref list, _("Protocol"), source.source_type.up ());
-            break;
         }
 
         try {