[Spice-commits] 5 commits - gtk/Makefile.am gtk/map-file gtk/spice-glib-sym-file gtk/spice-gtk-session-priv.h gtk/spice-gtk-session.h spice-common
Christophe Fergau
teuf at kemper.freedesktop.org
Wed Oct 29 10:22:49 PDT 2014
gtk/Makefile.am | 6 +++---
gtk/map-file | 36 ++++++++++++++++++------------------
gtk/spice-glib-sym-file | 34 +++++++++++++++++-----------------
gtk/spice-gtk-session-priv.h | 1 +
gtk/spice-gtk-session.h | 1 -
spice-common | 2 +-
6 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit 2e839d12894c3318351c60da74a70f674fc2c436
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Wed Oct 29 15:11:51 2014 +0100
Regenerate symbol files with make update-symbol-files
Some symbols were manually added to these files not in the right place
(non-alphabetical order). This causes spurious diffs when trying to
compare these files with the ones make update-symbol-files would
generate.
This commit syncs these file with the ones which are autogenerated to
spot more easily differences between the file in git and the
autogenerated one.
diff --git a/gtk/map-file b/gtk/map-file
index 90f14f1..12982be 100644
--- a/gtk/map-file
+++ b/gtk/map-file
@@ -7,6 +7,8 @@ spice_channel_connect;
spice_channel_destroy;
spice_channel_disconnect;
spice_channel_event_get_type;
+spice_channel_flush_async;
+spice_channel_flush_finish;
spice_channel_get_error;
spice_channel_get_type;
spice_channel_new;
@@ -16,15 +18,13 @@ spice_channel_string_to_type;
spice_channel_test_capability;
spice_channel_test_common_capability;
spice_channel_type_to_string;
-spice_channel_flush_async;
-spice_channel_flush_finish;
spice_client_error_quark;
spice_cursor_channel_get_type;
spice_display_channel_get_type;
-spice_display_get_primary;
spice_display_copy_to_guest;
spice_display_get_grab_keys;
spice_display_get_pixbuf;
+spice_display_get_primary;
spice_display_get_type;
spice_display_key_event_get_type;
spice_display_mouse_ungrab;
@@ -57,8 +57,6 @@ spice_inputs_motion;
spice_inputs_position;
spice_inputs_set_key_locks;
spice_main_agent_test_capability;
-spice_main_file_copy_async;
-spice_main_file_copy_finish;
spice_main_channel_get_type;
spice_main_clipboard_grab;
spice_main_clipboard_notify;
@@ -68,6 +66,8 @@ spice_main_clipboard_selection_grab;
spice_main_clipboard_selection_notify;
spice_main_clipboard_selection_release;
spice_main_clipboard_selection_request;
+spice_main_file_copy_async;
+spice_main_file_copy_finish;
spice_main_send_monitor_config;
spice_main_set_display;
spice_main_set_display_enabled;
@@ -83,6 +83,7 @@ spice_record_send_data;
spice_session_connect;
spice_session_disconnect;
spice_session_get_channels;
+spice_session_get_proxy_uri;
spice_session_get_read_only;
spice_session_get_type;
spice_session_has_channel_type;
@@ -90,7 +91,6 @@ spice_session_migration_get_type;
spice_session_new;
spice_session_open_fd;
spice_session_verify_get_type;
-spice_session_get_proxy_uri;
spice_set_session_option;
spice_smartcard_channel_get_type;
spice_smartcard_manager_get;
@@ -102,6 +102,18 @@ spice_smartcard_reader_get_type;
spice_smartcard_reader_insert_card;
spice_smartcard_reader_is_software;
spice_smartcard_reader_remove_card;
+spice_uri_get_hostname;
+spice_uri_get_password;
+spice_uri_get_port;
+spice_uri_get_scheme;
+spice_uri_get_type;
+spice_uri_get_user;
+spice_uri_set_hostname;
+spice_uri_set_password;
+spice_uri_set_port;
+spice_uri_set_scheme;
+spice_uri_set_user;
+spice_uri_to_string;
spice_usb_device_get_description;
spice_usb_device_get_type;
spice_usb_device_manager_can_redirect_device;
@@ -120,18 +132,6 @@ spice_util_get_debug;
spice_util_get_version_string;
spice_util_set_debug;
spice_uuid_to_string;
-spice_uri_get_hostname;
-spice_uri_get_password;
-spice_uri_get_port;
-spice_uri_get_scheme;
-spice_uri_get_type;
-spice_uri_get_user;
-spice_uri_set_hostname;
-spice_uri_set_password;
-spice_uri_set_port;
-spice_uri_set_scheme;
-spice_uri_set_user;
-spice_uri_to_string;
spice_webdav_channel_get_type;
local:
*;
diff --git a/gtk/spice-glib-sym-file b/gtk/spice-glib-sym-file
index a7a416d..2189fa5 100644
--- a/gtk/spice-glib-sym-file
+++ b/gtk/spice-glib-sym-file
@@ -12,16 +12,16 @@ spice_channel_get_type
spice_channel_new
spice_channel_open_fd
spice_channel_set_capability
+spice_channel_string_to_type
spice_channel_test_capability
spice_channel_test_common_capability
spice_channel_type_to_string
-spice_channel_string_to_type
spice_client_error_quark
spice_cursor_channel_get_type
spice_display_channel_get_type
spice_display_get_primary
-spice_g_signal_connect_object
spice_get_option_group
+spice_g_signal_connect_object
spice_inputs_button_press
spice_inputs_button_release
spice_inputs_channel_get_type
@@ -33,8 +33,6 @@ spice_inputs_motion
spice_inputs_position
spice_inputs_set_key_locks
spice_main_agent_test_capability
-spice_main_file_copy_async
-spice_main_file_copy_finish
spice_main_channel_get_type
spice_main_clipboard_grab
spice_main_clipboard_notify
@@ -44,6 +42,8 @@ spice_main_clipboard_selection_grab
spice_main_clipboard_selection_notify
spice_main_clipboard_selection_release
spice_main_clipboard_selection_request
+spice_main_file_copy_async
+spice_main_file_copy_finish
spice_main_send_monitor_config
spice_main_set_display
spice_main_set_display_enabled
@@ -78,6 +78,18 @@ spice_smartcard_reader_get_type
spice_smartcard_reader_insert_card
spice_smartcard_reader_is_software
spice_smartcard_reader_remove_card
+spice_uri_get_hostname
+spice_uri_get_password
+spice_uri_get_port
+spice_uri_get_scheme
+spice_uri_get_type
+spice_uri_get_user
+spice_uri_set_hostname
+spice_uri_set_password
+spice_uri_set_port
+spice_uri_set_scheme
+spice_uri_set_user
+spice_uri_to_string
spice_usb_device_get_description
spice_usb_device_get_type
spice_usb_device_manager_can_redirect_device
@@ -94,17 +106,4 @@ spice_util_get_debug
spice_util_get_version_string
spice_util_set_debug
spice_uuid_to_string
-spice_uri_get_hostname
-spice_uri_get_password
-spice_uri_get_port
-spice_uri_get_scheme
-spice_uri_get_type
-spice_uri_get_user
-spice_uri_set_hostname
-spice_uri_set_password
-spice_uri_set_port
-spice_uri_set_scheme
-spice_uri_set_user
-spice_uri_to_string
-spice_session_get_proxy_uri
spice_webdav_channel_get_type
commit e705ed0b32c28a0fadcc7a0eece48df3c93df380
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Wed Oct 29 15:57:02 2014 +0100
Tell ctags to ignore G_GNUC_CONST in declarations
Without that, it will fail to parse:
GType spice_uri_get_type(void) G_GNUC_CONST;
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 1430354..7bc5842 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -677,13 +677,13 @@ endif
update-symbol-files:
( echo "SPICEGTK_1 {" ; \
echo "global:" ; \
- ctags -f - --c-kinds=p $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) | awk '/^spice_/ { print $$1 ";" }' | sort ; \
+ ctags -f - -I G_GNUC_CONST --c-kinds=p $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) | awk '/^spice_/ { print $$1 ";" }' | sort ; \
echo "local:" ; \
echo "*;" ; \
echo "};" ) > $(srcdir)/map-file
- ( ctags -f - --c-kinds=p $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) | awk '/^spice_/ { print $$1 }' | sort ; \
+ ( ctags -f - -I G_GNUC_CONST --c-kinds=p $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) | awk '/^spice_/ { print $$1 }' | sort ; \
) > $(srcdir)/spice-glib-sym-file
- ( ctags -f - --c-kinds=p $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) | awk '/^spice_/ { print $$1 }' | sort ; \
+ ( ctags -f - -I G_GNUC_CONST --c-kinds=p $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) | awk '/^spice_/ { print $$1 }' | sort ; \
) > $(srcdir)/spice-gtk-sym-file
-include $(top_srcdir)/git.mk
commit 030af4296bb25a83ba16bf9117c4cfd553064848
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Wed Oct 29 15:09:08 2014 +0100
Remove spice_gtk_session_sync_keyboard_modifiers from public headers
It's not meant to be exported as it's not listed in spice-gtk symbol map file.
diff --git a/gtk/spice-gtk-session-priv.h b/gtk/spice-gtk-session-priv.h
index aba6fe9..48482b6 100644
--- a/gtk/spice-gtk-session-priv.h
+++ b/gtk/spice-gtk-session-priv.h
@@ -25,6 +25,7 @@ G_BEGIN_DECLS
void spice_gtk_session_request_auto_usbredir(SpiceGtkSession *self,
gboolean state);
gboolean spice_gtk_session_get_read_only(SpiceGtkSession *self);
+void spice_gtk_session_sync_keyboard_modifiers(SpiceGtkSession *self);
G_END_DECLS
diff --git a/gtk/spice-gtk-session.h b/gtk/spice-gtk-session.h
index fbcc353..3b4eac6 100644
--- a/gtk/spice-gtk-session.h
+++ b/gtk/spice-gtk-session.h
@@ -59,7 +59,6 @@ GType spice_gtk_session_get_type(void);
SpiceGtkSession *spice_gtk_session_get(SpiceSession *session);
void spice_gtk_session_copy_to_guest(SpiceGtkSession *self);
void spice_gtk_session_paste_from_guest(SpiceGtkSession *self);
-void spice_gtk_session_sync_keyboard_modifiers(SpiceGtkSession *self);
G_END_DECLS
commit b7b5f999d4de5e6810cc5f8d2d10aef12b837e8f
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Wed Oct 29 14:58:00 2014 +0100
Add spice_session_get_proxy_uri to spice-glib-sym-file
It was only added to map-file.
diff --git a/gtk/spice-glib-sym-file b/gtk/spice-glib-sym-file
index 878dd12..a7a416d 100644
--- a/gtk/spice-glib-sym-file
+++ b/gtk/spice-glib-sym-file
@@ -59,6 +59,7 @@ spice_record_send_data
spice_session_connect
spice_session_disconnect
spice_session_get_channels
+spice_session_get_proxy_uri
spice_session_get_read_only
spice_session_get_type
spice_session_has_channel_type
commit 0f7bb7c27f1ef3e710ce495bb64bb7766e0ec721
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Wed Oct 29 14:26:28 2014 +0100
Update spice-common submodule
This picks up some warning fixes.
diff --git a/spice-common b/spice-common
index d45b3e2..c22fbff 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit d45b3e2765ec130d047020d34985e65fa7fb166b
+Subproject commit c22fbffbc79f92e1d2976f6f19bf275cf81b5ec2
More information about the Spice-commits
mailing list