[libvirt] [libvirt-glib/libvirt-gconfig 16/17] gconfig: Adapt GVirConfigDomainGraphicsDesktop to GVirConfigDomainGraphicsLocal
This patch adapts GVirConfigDomainGraphicsDesktop to the new
GVirConfigDomainGraphicsLocal, inheriting from it and using its helper
functions for getting display and fullscreen properties.
As GVirConfigDomainGraphicsDesktop now inherits from
GVirConfigDomainGraphicsLocal, this patch also introduces an ABI
breakage.
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c | 11 +++--------
libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.h | 4 ++--
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c
b/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c
index dadf684..7d23b77 100644
--- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c
+++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c
@@ -33,7 +33,7 @@ struct _GVirConfigDomainGraphicsDesktopPrivate
gboolean unused;
};
-G_DEFINE_TYPE(GVirConfigDomainGraphicsDesktop, gvir_config_domain_graphics_desktop,
GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS);
+G_DEFINE_TYPE(GVirConfigDomainGraphicsDesktop, gvir_config_domain_graphics_desktop,
GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_LOCAL);
static void
gvir_config_domain_graphics_desktop_class_init(GVirConfigDomainGraphicsDesktopClass
*klass)
@@ -88,9 +88,7 @@ const gchar
*gvir_config_domain_graphics_desktop_get_display(GVirConfigDomainGra
{
g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_GRAPHICS_DESKTOP(graphics), NULL);
- return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(graphics),
- NULL,
- "display");
+ return
gvir_config_domain_graphics_local_get_display(GVIR_CONFIG_DOMAIN_GRAPHICS_LOCAL(graphics));
}
@@ -111,8 +109,5 @@ gboolean
gvir_config_domain_graphics_desktop_get_fullscreen(GVirConfigDomainGrap
{
g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_GRAPHICS_DESKTOP(graphics), FALSE);
- return gvir_config_object_get_attribute_boolean(GVIR_CONFIG_OBJECT(graphics),
- NULL,
- "fullscreen",
- FALSE);
+ return
gvir_config_domain_graphics_local_get_fullscreen(GVIR_CONFIG_DOMAIN_GRAPHICS_LOCAL(graphics));
}
diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.h
b/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.h
index 7e7e635..c117882 100644
--- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.h
+++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.h
@@ -42,7 +42,7 @@ typedef struct _GVirConfigDomainGraphicsDesktopClass
GVirConfigDomainGraphicsDes
struct _GVirConfigDomainGraphicsDesktop
{
- GVirConfigDomainGraphics parent;
+ GVirConfigDomainGraphicsLocal parent;
GVirConfigDomainGraphicsDesktopPrivate *priv;
@@ -51,7 +51,7 @@ struct _GVirConfigDomainGraphicsDesktop
struct _GVirConfigDomainGraphicsDesktopClass
{
- GVirConfigDomainGraphicsClass parent_class;
+ GVirConfigDomainGraphicsLocalClass parent_class;
gpointer padding[20];
};
--
2.5.0