[libvirt] [libvirt-glib] Make use of G_PARAM_STATIC_STRINGS everywhere
Christophe Fergeau
cfergeau at redhat.com
Fri Jan 13 09:01:46 UTC 2012
G_PARAM_STATIC_STRINGS was added in glib 2.13, configure.ac only check for
glib 2.10 at the moment. The patch looks good, but please wait until we
make a decision on the minimum glib version we require so that we know if
we need to add some fallback for this or not. Imo raising the requirement
to 2.18 shouldn't be an issue, but let's see.
Christophe
On Fri, Jan 13, 2012 at 05:47:24AM +0200, Zeeshan Ali (Khattak) wrote:
> From: "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org>
>
> ---
> libvirt-gobject/libvirt-gobject-connection.c | 28 +++++++++------------
> libvirt-gobject/libvirt-gobject-domain-snapshot.c | 4 +--
> libvirt-gobject/libvirt-gobject-domain.c | 8 +----
> libvirt-gobject/libvirt-gobject-interface.c | 4 +--
> libvirt-gobject/libvirt-gobject-network-filter.c | 4 +--
> libvirt-gobject/libvirt-gobject-network.c | 4 +--
> libvirt-gobject/libvirt-gobject-node-device.c | 4 +--
> libvirt-gobject/libvirt-gobject-secret.c | 4 +--
> libvirt-gobject/libvirt-gobject-storage-pool.c | 5 +--
> libvirt-gobject/libvirt-gobject-storage-vol.c | 4 +--
> libvirt-gobject/libvirt-gobject-stream.c | 4 +--
> 11 files changed, 24 insertions(+), 49 deletions(-)
>
> diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c
> index f0c9ff6..a90581a 100644
> --- a/libvirt-gobject/libvirt-gobject-connection.c
> +++ b/libvirt-gobject/libvirt-gobject-connection.c
> @@ -163,9 +163,18 @@ static void gvir_connection_class_init(GVirConnectionClass *klass)
> G_PARAM_READABLE |
> G_PARAM_WRITABLE |
> G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
> +
> + g_object_class_install_property(object_class,
> + PROP_HANDLE,
> + g_param_spec_boxed("handle",
> + "Handle",
> + "The connection handle",
> + GVIR_TYPE_CONNECTION_HANDLE,
> + G_PARAM_READABLE |
> + G_PARAM_WRITABLE |
> + G_PARAM_CONSTRUCT_ONLY |
> + G_PARAM_STATIC_STRINGS));
>
> signals[VIR_CONNECTION_OPENED] = g_signal_new("connection-opened",
> G_OBJECT_CLASS_TYPE(object_class),
> @@ -205,19 +214,6 @@ static void gvir_connection_class_init(GVirConnectionClass *klass)
> 1,
> GVIR_TYPE_DOMAIN);
>
> - g_object_class_install_property(object_class,
> - PROP_HANDLE,
> - g_param_spec_boxed("handle",
> - "Handle",
> - "The connection handle",
> - GVIR_TYPE_CONNECTION_HANDLE,
> - G_PARAM_READABLE |
> - G_PARAM_WRITABLE |
> - G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> -
> g_type_class_add_private(klass, sizeof(GVirConnectionPrivate));
> }
>
> diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c
> index e68321d..950555a 100644
> --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c
> +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c
> @@ -126,9 +126,7 @@ static void gvir_domain_snapshot_class_init(GVirDomainSnapshotClass *klass)
> G_PARAM_READABLE |
> G_PARAM_WRITABLE |
> G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
>
> g_type_class_add_private(klass, sizeof(GVirDomainSnapshotPrivate));
> }
> diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c
> index 2974bb8..2bc12d9 100644
> --- a/libvirt-gobject/libvirt-gobject-domain.c
> +++ b/libvirt-gobject/libvirt-gobject-domain.c
> @@ -157,9 +157,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass)
> G_PARAM_READABLE |
> G_PARAM_WRITABLE |
> G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
>
> g_object_class_install_property(object_class,
> PROP_PERSISTENT,
> @@ -168,9 +166,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass)
> "If domain is persistent",
> TRUE,
> G_PARAM_READABLE |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
>
> signals[VIR_STARTED] = g_signal_new("started",
> G_OBJECT_CLASS_TYPE(object_class),
> diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c
> index 7e6e9b0..c9950f7 100644
> --- a/libvirt-gobject/libvirt-gobject-interface.c
> +++ b/libvirt-gobject/libvirt-gobject-interface.c
> @@ -125,9 +125,7 @@ static void gvir_interface_class_init(GVirInterfaceClass *klass)
> G_PARAM_READABLE |
> G_PARAM_WRITABLE |
> G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
>
> g_type_class_add_private(klass, sizeof(GVirInterfacePrivate));
> }
> diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c
> index f0fd024..fe1a042 100644
> --- a/libvirt-gobject/libvirt-gobject-network-filter.c
> +++ b/libvirt-gobject/libvirt-gobject-network-filter.c
> @@ -142,9 +142,7 @@ static void gvir_network_filter_class_init(GVirNetworkFilterClass *klass)
> G_PARAM_READABLE |
> G_PARAM_WRITABLE |
> G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
>
> g_type_class_add_private(klass, sizeof(GVirNetworkFilterPrivate));
> }
> diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c
> index 847c236..75e010d 100644
> --- a/libvirt-gobject/libvirt-gobject-network.c
> +++ b/libvirt-gobject/libvirt-gobject-network.c
> @@ -140,9 +140,7 @@ static void gvir_network_class_init(GVirNetworkClass *klass)
> G_PARAM_READABLE |
> G_PARAM_WRITABLE |
> G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
>
> g_type_class_add_private(klass, sizeof(GVirNetworkPrivate));
> }
> diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c
> index 59fe84b..f8d536e 100644
> --- a/libvirt-gobject/libvirt-gobject-node-device.c
> +++ b/libvirt-gobject/libvirt-gobject-node-device.c
> @@ -126,9 +126,7 @@ static void gvir_node_device_class_init(GVirNodeDeviceClass *klass)
> G_PARAM_READABLE |
> G_PARAM_WRITABLE |
> G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
>
> g_type_class_add_private(klass, sizeof(GVirNodeDevicePrivate));
> }
> diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c
> index 0c81921..bc5ee3b 100644
> --- a/libvirt-gobject/libvirt-gobject-secret.c
> +++ b/libvirt-gobject/libvirt-gobject-secret.c
> @@ -142,9 +142,7 @@ static void gvir_secret_class_init(GVirSecretClass *klass)
> G_PARAM_READABLE |
> G_PARAM_WRITABLE |
> G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
>
> g_type_class_add_private(klass, sizeof(GVirSecretPrivate));
> }
> diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c
> index 4eb8eec..5bd3f0a 100644
> --- a/libvirt-gobject/libvirt-gobject-storage-pool.c
> +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c
> @@ -152,9 +152,8 @@ static void gvir_storage_pool_class_init(GVirStoragePoolClass *klass)
> G_PARAM_READABLE |
> G_PARAM_WRITABLE |
> G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
> +
>
> g_type_class_add_private(klass, sizeof(GVirStoragePoolPrivate));
> }
> diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c
> index 4f62732..5b18877 100644
> --- a/libvirt-gobject/libvirt-gobject-storage-vol.c
> +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c
> @@ -126,9 +126,7 @@ static void gvir_storage_vol_class_init(GVirStorageVolClass *klass)
> G_PARAM_READABLE |
> G_PARAM_WRITABLE |
> G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
>
> g_type_class_add_private(klass, sizeof(GVirStorageVolPrivate));
> }
> diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c
> index 6b75819..a1039b1 100644
> --- a/libvirt-gobject/libvirt-gobject-stream.c
> +++ b/libvirt-gobject/libvirt-gobject-stream.c
> @@ -247,9 +247,7 @@ static void gvir_stream_class_init(GVirStreamClass *klass)
> G_PARAM_READABLE |
> G_PARAM_WRITABLE |
> G_PARAM_CONSTRUCT_ONLY |
> - G_PARAM_STATIC_NAME |
> - G_PARAM_STATIC_NICK |
> - G_PARAM_STATIC_BLURB));
> + G_PARAM_STATIC_STRINGS));
>
> g_type_class_add_private(klass, sizeof(GVirStreamPrivate));
> }
> --
> 1.7.7.5
>
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20120113/0119c014/attachment-0001.sig>
More information about the libvir-list
mailing list