[Spice-commits] 6 commits - doc/reference src/channel-display.c src/channel-smartcard.c src/channel-usbredir.c src/spice-file-transfer-task.h src/usb-device-manager.c
Pavel Grunt
pgrunt at kemper.freedesktop.org
Wed Mar 30 09:39:57 UTC 2016
doc/reference/Makefile.am | 1 +
doc/reference/spice-gtk-sections.txt | 8 +-------
src/channel-display.c | 2 ++
src/channel-smartcard.c | 2 +-
src/channel-usbredir.c | 2 +-
src/spice-file-transfer-task.h | 2 +-
src/usb-device-manager.c | 14 +++++++++-----
7 files changed, 16 insertions(+), 15 deletions(-)
New commits:
commit ec71a0451d891b944f42904635978830843b11fa
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Wed Mar 30 09:00:21 2016 +0200
doc: Add description for spice_display_get_gl_scanout()
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/src/channel-display.c b/src/channel-display.c
index 90d155e..431c2e7 100644
--- a/src/channel-display.c
+++ b/src/channel-display.c
@@ -532,6 +532,8 @@ void spice_display_change_preferred_compression(SpiceChannel *channel, gint comp
* spice_display_get_gl_scanout:
* @channel: a #SpiceDisplayChannel
*
+ * Retrieves the GL scanout if available
+ *
* Returns: the current GL scanout, or %NULL if none or not valid
*
* Since: 0.31
commit dd31fc14142cbd84636881153869752967b27ee6
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Wed Mar 30 09:00:20 2016 +0200
doc: Ignore spicy-connect
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index cb01f97..5aa8557 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -46,6 +46,7 @@ IGNORE_HFILES= \
spice-uri-priv.h \
spice-util-priv.h \
spice-widget-priv.h \
+ spicy-connect.h \
usb-acl-helper.h \
usb-device-manager-priv.h \
usbutil.h \
commit 7615405237a8081fe15d7443a250e20f1d519c50
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Wed Mar 30 09:00:19 2016 +0200
spice-file-transfer-task: Fix docstring
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/src/spice-file-transfer-task.h b/src/spice-file-transfer-task.h
index b97d107..18dc509 100644
--- a/src/spice-file-transfer-task.h
+++ b/src/spice-file-transfer-task.h
@@ -37,7 +37,7 @@ typedef struct _SpiceFileTransferTaskPrivate SpiceFileTransferTaskPrivate;
/**
* SpiceFileTransferTask:
*
- * The #FileTransferTask struct is opaque and should not be accessed directly.
+ * The #SpiceFileTransferTask struct is opaque and should not be accessed directly.
*/
struct _SpiceFileTransferTask
{
commit 7e52f80ce85bf4c71c74e87006b7afb2f4923f82
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Wed Mar 30 09:00:18 2016 +0200
doc: channel stability should be Stable
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/src/channel-smartcard.c b/src/channel-smartcard.c
index 7f3306e..21df98a 100644
--- a/src/channel-smartcard.c
+++ b/src/channel-smartcard.c
@@ -35,7 +35,7 @@
* @title: Smartcard Channel
* @section_id:
* @see_also: #SpiceSmartcardManager, #SpiceSession
- * @stability: API Stable (channel in development)
+ * @stability: Stable
* @include: spice-client.h
*
* The Spice protocol defines a set of messages to forward smartcard
diff --git a/src/channel-usbredir.c b/src/channel-usbredir.c
index a251855..9066b4a 100644
--- a/src/channel-usbredir.c
+++ b/src/channel-usbredir.c
@@ -42,7 +42,7 @@
* @short_description: usb redirection
* @title: USB Redirection Channel
* @section_id:
- * @stability: API Stable (channel in development)
+ * @stability: Stable
* @include: spice-client.h
*
* The Spice protocol defines a set of messages to redirect USB devices
commit af82fd1ed750ef8550c7fb854c96c131132cd687
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Wed Mar 30 09:00:17 2016 +0200
doc: Remove private structs
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/doc/reference/spice-gtk-sections.txt b/doc/reference/spice-gtk-sections.txt
index 0c05168..a6fcfbf 100644
--- a/doc/reference/spice-gtk-sections.txt
+++ b/doc/reference/spice-gtk-sections.txt
@@ -337,8 +337,6 @@ SpiceUsbDeviceManagerPrivate
<SECTION>
<FILE>spice-gtk-session</FILE>
<TITLE>SpiceGtkSession</TITLE>
-SpiceGtkSession
-SpiceGtkSessionClass
spice_gtk_session_get
spice_gtk_session_copy_to_guest
spice_gtk_session_paste_from_guest
@@ -357,8 +355,6 @@ SpiceGtkSessionPrivate
<SECTION>
<FILE>spice-widget</FILE>
<TITLE>SpiceDisplay</TITLE>
-SpiceDisplay
-SpiceDisplayClass
SpiceDisplayKeyEvent
spice_display_new
spice_display_new_with_monitor
@@ -368,7 +364,6 @@ spice_display_get_grab_keys
spice_display_send_keys
spice_display_get_pixbuf
<SUBSECTION>
-SpiceGrabSequence
spice_grab_sequence_new
spice_grab_sequence_new_from_string
spice_grab_sequence_copy
@@ -393,8 +388,6 @@ SpiceDisplayPrivate
<SECTION>
<FILE>usb-device-widget</FILE>
<TITLE>SpiceUsbDeviceWidget</TITLE>
-SpiceUsbDeviceWidget
-SpiceUsbDeviceWidgetClass
<SUBSECTION>
spice_usb_device_widget_new
<SUBSECTION Standard>
commit 61f502f876e6f4d85795e68bed0a706c847a775a
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Wed Mar 30 09:00:16 2016 +0200
usb-device-manager: Fix docstring
Add description, "Since" and change the parameter name in the docstring
to match parameter name in the function definition.
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/doc/reference/spice-gtk-sections.txt b/doc/reference/spice-gtk-sections.txt
index 8947893..0c05168 100644
--- a/doc/reference/spice-gtk-sections.txt
+++ b/doc/reference/spice-gtk-sections.txt
@@ -311,6 +311,7 @@ spice_usb_device_manager_get
spice_usb_device_manager_get_devices
spice_usb_device_manager_get_devices_with_filter
spice_usb_device_manager_is_device_connected
+spice_usb_device_manager_is_redirecting
spice_usb_device_manager_disconnect_device
spice_usb_device_manager_can_redirect_device
spice_usb_device_manager_connect_device_async
diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c
index c36a9a8..da7e596 100644
--- a/src/usb-device-manager.c
+++ b/src/usb-device-manager.c
@@ -232,11 +232,15 @@ G_DEFINE_BOXED_TYPE(SpiceUsbDevice, spice_usb_device, g_object_ref, g_object_unr
#endif
/**
-* spice_usb_device_manager_is_redirecting:
-* @manager: the #SpiceUsbDeviceManager manager
-*
-* Returns: %TRUE if device redirection negotiation flow is in progress
-*/
+ * spice_usb_device_manager_is_redirecting:
+ * @self: the #SpiceUsbDeviceManager manager
+ *
+ * Checks whether a device is being redirected
+ *
+ * Returns: %TRUE if device redirection negotiation flow is in progress
+ *
+ * Since: 0.32
+ */
gboolean spice_usb_device_manager_is_redirecting(SpiceUsbDeviceManager *self)
{
#ifdef USE_USBREDIR
More information about the Spice-commits
mailing list