[gnome-boxes] libvirt-machine-properties: add_*_property() return Property
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes] libvirt-machine-properties: add_*_property() return Property
- Date: Fri, 15 Feb 2013 14:29:53 +0000 (UTC)
commit 43884e19f8881a4dc88bf50c2d0cffab377051f3
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Wed Feb 6 00:50:59 2013 +0200
libvirt-machine-properties: add_*_property() return Property
add_*_property() methods now return ref to the property they add.
https://bugzilla.gnome.org/show_bug.cgi?id=688333
src/libvirt-machine-properties.vala | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/src/libvirt-machine-properties.vala b/src/libvirt-machine-properties.vala
index 995cc6c..1cd00c3 100644
--- a/src/libvirt-machine-properties.vala
+++ b/src/libvirt-machine-properties.vala
@@ -347,7 +347,7 @@ private class Boxes.LibvirtMachineProperties: GLib.Object, Boxes.IPropertiesProv
} catch (GLib.Error e) {}
}
- private void add_ram_property (ref List<Boxes.Property> list) {
+ private SizeProperty? add_ram_property (ref List<Boxes.Property> list) {
try {
var max_ram = machine.connection.get_node_info ().memory;
@@ -365,7 +365,11 @@ private class Boxes.LibvirtMachineProperties: GLib.Object, Boxes.IPropertiesProv
});
update_ram_property (property);
- } catch (GLib.Error error) {}
+
+ return property;
+ } catch (GLib.Error error) {
+ return null;
+ }
}
private void on_ram_changed (Boxes.Property property, uint64 value) {
@@ -448,9 +452,9 @@ private class Boxes.LibvirtMachineProperties: GLib.Object, Boxes.IPropertiesProv
App.app.notificationbar.display_for_action (message, Gtk.Stock.YES, (owned) reboot);
}
- private void add_storage_property (ref List<Boxes.Property> list) {
+ private SizeProperty? add_storage_property (ref List<Boxes.Property> list) {
if (machine.storage_volume == null)
- return;
+ return null;
try {
var volume_info = machine.storage_volume.get_info ();
@@ -465,10 +469,13 @@ private class Boxes.LibvirtMachineProperties: GLib.Object, Boxes.IPropertiesProv
max_storage,
256 * Osinfo.MEBIBYTES);
property.changed.connect (on_storage_changed);
+
+ return property;
} catch (GLib.Error error) {
warning ("Failed to get information on volume '%s' or it's parent pool: %s",
machine.storage_volume.get_name (),
error.message);
+ return null;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]