[Spice-devel] [PATCH spice-gtk 1/8] Regenerate map-file correctly

[Hans de Goede]

Ack.

On 11/23/2011 01:23 PM, Marc-André Lureau wrote:
> We should use update-map-file instead of modifying it manually
> ---
>   gtk/Makefile.am |    4 ++--
>   gtk/map-file    |   20 ++++++++++----------
>   2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/gtk/Makefile.am b/gtk/Makefile.am
> index a3960a7..d770ec1 100644
> --- a/gtk/Makefile.am
> +++ b/gtk/Makefile.am
> @@ -220,7 +220,6 @@ libspice_client_glib_2_0_la_SOURCES =	\
>   	channel-usbredir.c		\
>   	channel-usbredir-priv.h		\
>   	smartcard-manager.c		\
> -	smartcard-manager.h		\
>   	smartcard-manager-priv.h	\
>   	usb-device-manager.c		\
>   	$(GUSB_SRCS)			\
> @@ -282,6 +281,7 @@ libspice_client_glibinclude_HEADERS =	\
>   	channel-smartcard.h		\
>   	channel-usbredir.h		\
>   	usb-device-manager.h		\
> +	smartcard-manager.h		\
>   	$(NULL)
>
>   nodist_libspice_client_glibinclude_HEADERS =	\
> @@ -538,7 +538,7 @@ PREFIX_ARGS = --strip-prefix=Spice
>   endif
>
>   INTROSPECTION_GIRS =
> -INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(builddir) $(PREFIX_ARGS)
> +INTROSPECTION_SCANNER_ARGS = --warn-all --accept-unprefixed --add-include-path=$(builddir) $(PREFIX_ARGS)
>   INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
>
>   if HAVE_INTROSPECTION
> diff --git a/gtk/map-file b/gtk/map-file
> index f9bc46c..da5f4b9 100644
> --- a/gtk/map-file
> +++ b/gtk/map-file
> @@ -1,8 +1,8 @@
>   SPICEGTK_1 {
>   global:
> +spice_audio_get;
>   spice_audio_get_type;
>   spice_audio_new;
> -spice_audio_get;
>   spice_channel_connect;
>   spice_channel_destroy;
>   spice_channel_disconnect;
> @@ -34,6 +34,10 @@ spice_grab_sequence_free;
>   spice_grab_sequence_get_type;
>   spice_grab_sequence_new;
>   spice_grab_sequence_new_from_string;
> +spice_gtk_session_copy_to_guest;
> +spice_gtk_session_get;
> +spice_gtk_session_get_type;
> +spice_gtk_session_paste_from_guest;
>   spice_inputs_button_press;
>   spice_inputs_button_release;
>   spice_inputs_channel_get_type;
> @@ -68,10 +72,6 @@ spice_session_migration_get_type;
>   spice_session_new;
>   spice_session_open_fd;
>   spice_session_verify_get_type;
> -spice_gtk_session_get;
> -spice_gtk_session_get_type;
> -spice_gtk_session_copy_to_guest;
> -spice_gtk_session_paste_from_guest;
>   spice_set_session_option;
>   spice_smartcard_channel_get_type;
>   spice_smartcard_manager_get;
> @@ -80,15 +80,15 @@ spice_smartcard_manager_insert_card;
>   spice_smartcard_manager_remove_card;
>   spice_smartcard_reader_get_type;
>   spice_smartcard_reader_is_software;
> -spice_usbredir_channel_get_type;
> -spice_usb_device_get_type;
>   spice_usb_device_get_description;
> -spice_usb_device_manager_get_type;
> +spice_usb_device_get_type;
> +spice_usb_device_manager_connect_device;
> +spice_usb_device_manager_disconnect_device;
>   spice_usb_device_manager_get;
>   spice_usb_device_manager_get_devices;
> +spice_usb_device_manager_get_type;
>   spice_usb_device_manager_is_device_connected;
> -spice_usb_device_manager_connect_device;
> -spice_usb_device_manager_disconnect_device;
> +spice_usbredir_channel_get_type;
>   spice_util_get_debug;
>   spice_util_get_version_string;
>   spice_util_set_debug;