Add vapi generation from GIR (eda464be) · Commits · DLNA-RUI / gupnp

Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

		SUBDIRS = libgupnp tools examples tests doc
		SUBDIRS = libgupnp tools examples tests doc vala

		pkgconfig_DATA= gupnp-1.0.pc
		pkgconfigdir = $(libdir)/pkgconfig

+10 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,15 @@ if test "x$enable_debug" = "xyes"; then
		CFLAGS="$CFLAGS -g -Wall -Werror"
		fi

		GOBJECT_INTROSPECTION_CHECK([0.6.4])
		GOBJECT_INTROSPECTION_CHECK([1.33.4])

		# vapigen
		AS_IF([test "x$found_introspection" = "xyes"],
		[
		VALA_PROG_VAPIGEN([0.14])
		]
		)
		AM_CONDITIONAL([HAVE_VAPIGEN], [test "x$VAPIGEN" != "x"])

		# Gtk-doc
		GTK_DOC_CHECK([1.0])
		@@ -141,6 +149,7 @@ tests/Makefile
		tests/gtest/Makefile
		doc/Makefile
		doc/version.xml
		vala/Makefile
		gupnp-1.0.pc
		gupnp-1.0-uninstalled.pc
		])

+4 −3

Original line number	Diff line number	Diff line
		@@ -545,9 +545,10 @@ _gupnp_context_get_server_url (GUPnPContext *context)

		/**
		* gupnp_context_new:
		* @main_context: Deprecated: 0.17.2: Always set to %NULL. If you want to use
		* a different context, use g_main_context_push_thread_default().
		* @interface: The network interface to use, or %NULL to auto-detect.
		* @main_context: (allow-none): Deprecated: 0.17.2: Always set to %NULL. If you
		* want to use a different context, use g_main_context_push_thread_default().
		* @interface: (allow-none): The network interface to use, or %NULL to
		* auto-detect.
		* @port: Port to run on, or 0 if you don't care what port is used.
		* @error: A location to store a #GError, or %NULL
		*

+12 −16

Original line number	Diff line number	Diff line
		@@ -101,11 +101,7 @@ gupnp_device_info_set_property (GObject *object,
		info->priv->device_type = g_value_dup_string (value);
		break;
		case PROP_URL_BASE:
		info->priv->url_base = g_value_get_pointer (value);
		if (info->priv->url_base)
		info->priv->url_base =
		soup_uri_copy (info->priv->url_base);

		info->priv->url_base = g_value_dup_boxed (value);
		break;
		case PROP_DOCUMENT:
		info->priv->doc = g_value_dup_object (value);
		@@ -151,8 +147,7 @@ gupnp_device_info_get_property (GObject *object,
		gupnp_device_info_get_device_type (info));
		break;
		case PROP_URL_BASE:
		g_value_set_pointer (value,
		info->priv->url_base);
		g_value_set_boxed (value, info->priv->url_base);
		break;
		default:
		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
		@@ -314,9 +309,10 @@ gupnp_device_info_class_init (GUPnPDeviceInfoClass *klass)
		g_object_class_install_property
		(object_class,
		PROP_URL_BASE,
		g_param_spec_pointer ("url-base",
		g_param_spec_boxed ("url-base",
		"URL base",
		"The URL base",
		SOUP_TYPE_URI,
		G_PARAM_READWRITE \|
		G_PARAM_CONSTRUCT_ONLY \|
		G_PARAM_STATIC_NAME \|
		@@ -1109,7 +1105,7 @@ gupnp_device_info_list_device_types (GUPnPDeviceInfo *info)
		* this function a new object is created. The application must cache any used
		* devices if it wishes to keep them around and re-use them.
		*
		* Returns: (transfer full): A new #GUPnPDeviceInfo.
		* Returns: (transfer full)(allow-none): A new #GUPnPDeviceInfo.
		**/
		GUPnPDeviceInfo *
		gupnp_device_info_get_device (GUPnPDeviceInfo *info,

+12 −15

Original line number	Diff line number	Diff line
		@@ -118,11 +118,7 @@ gupnp_service_info_set_property (GObject *object,
		info->priv->service_type = g_value_dup_string (value);
		break;
		case PROP_URL_BASE:
		info->priv->url_base = g_value_get_pointer (value);
		if (info->priv->url_base)
		info->priv->url_base =
		soup_uri_copy (info->priv->url_base);

		info->priv->url_base = g_value_dup_boxed (value);
		break;
		case PROP_DOCUMENT:
		info->priv->doc = g_value_dup_object (value);
		@@ -164,7 +160,7 @@ gupnp_service_info_get_property (GObject *object,
		gupnp_service_info_get_service_type (info));
		break;
		case PROP_URL_BASE:
		g_value_set_pointer (value,
		g_value_set_boxed (value,
		info->priv->url_base);
		break;
		default:
		@@ -326,9 +322,10 @@ gupnp_service_info_class_init (GUPnPServiceInfoClass *klass)
		g_object_class_install_property
		(object_class,
		PROP_URL_BASE,
		g_param_spec_pointer ("url-base",
		g_param_spec_boxed ("url-base",
		"URL base",
		"The URL base",
		SOUP_TYPE_URI,
		G_PARAM_READWRITE \|
		G_PARAM_CONSTRUCT_ONLY \|
		G_PARAM_STATIC_NAME \|