[Spice-commits] 2 commits - gtk/Makefile.am gtk/spice-audio.c gtk/usb-device-manager.c gtk/usb-device-widget.c

[Christophe Fergau]

 gtk/Makefile.am          |    1 +
 gtk/spice-audio.c        |    6 ++++--
 gtk/usb-device-manager.c |    8 +++++---
 gtk/usb-device-widget.c  |    3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 0c8eccaff742fa1c7e55fa0ea4957bd23be5d3a5
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Jun 28 13:35:41 2013 +0200

    gi: Add (allow none) to optional const char * params
    
    Without that annotation, it will not be possible to pass NULL to
    these methods when using a gi-based binding.

diff --git a/gtk/spice-audio.c b/gtk/spice-audio.c
index 6cf8f01..dbd3a8b 100644
--- a/gtk/spice-audio.c
+++ b/gtk/spice-audio.c
@@ -195,8 +195,10 @@ static void session_enable_audio(GObject *gobject, GParamSpec *pspec,
 /**
  * spice_audio_new:
  * @session: the #SpiceSession to connect to
- * @context: a #GMainContext to attach to (or %NULL for default).
- * @name: a name for the audio channels (or %NULL for application name).
+ * @context: (allow-none): a #GMainContext to attach to (or %NULL for
+ * default).
+ * @name: (allow-none): a name for the audio channels (or %NULL for
+ * application name).
  *
  * Once instantiated, #SpiceAudio will handle the playback and record
  * channels to stream to your local audio system.
diff --git a/gtk/usb-device-manager.c b/gtk/usb-device-manager.c
index bdcfd13..8a20e9e 100644
--- a/gtk/usb-device-manager.c
+++ b/gtk/usb-device-manager.c
@@ -1305,8 +1305,9 @@ SpiceUsbDeviceManager *spice_usb_device_manager_get(SpiceSession *session,
 /**
  * spice_usb_device_manager_get_devices_with_filter:
  * @manager: the #SpiceUsbDeviceManager manager
- * @filter: filter string for selecting which devices to return, see
- *      #SpiceUsbDeviceManager:auto-connect-filter for the filter string format
+ * @filter: (allow-none): filter string for selecting which devices to return,
+ *      see #SpiceUsbDeviceManager:auto-connect-filter for the f ilter
+ *      string format
  *
  * Returns: (element-type SpiceUsbDevice) (transfer full): a
  * %GPtrArray array of %SpiceUsbDevice
@@ -1658,7 +1659,8 @@ spice_usb_device_manager_can_redirect_device(SpiceUsbDeviceManager  *self,
 /**
  * spice_usb_device_get_description:
  * @device: #SpiceUsbDevice to get the description of
- * @format: an optionnal printf() format string with positional parameters
+ * @format: (allow-none): an optional printf() format string with
+ * positional parameters
  *
  * Get a string describing the device which is suitable as a description of
  * the device for the end user. The returned string should be freed with
diff --git a/gtk/usb-device-widget.c b/gtk/usb-device-widget.c
index 8621a5e..69c74b3 100644
--- a/gtk/usb-device-widget.c
+++ b/gtk/usb-device-widget.c
@@ -328,7 +328,8 @@ static void spice_usb_device_widget_init(SpiceUsbDeviceWidget *self)
 /**
  * spice_usb_device_widget_new:
  * @session: #SpiceSession for which to widget will control USB redirection
- * @device_format_string: String passed to spice_usb_device_get_description()
+ * @device_format_string: (allow-none): String passed to
+ * spice_usb_device_get_description()
  *
  * Returns: a new #SpiceUsbDeviceWidget instance
  */
commit e19957c3d5aa4cf87036a5c6f4fa9eac488ba225
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Jun 28 13:34:57 2013 +0200

    gi: Make sure usb-device-widget.c is introspected
    
    If it's not, annotation we add to inline gtk-doc comments won't
    be taken into account in the .gir file.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d1e6f66..82aa9a3 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -606,6 +606,7 @@ gtk_introspection_files =				\
 	spice-gtk-session.c				\
 	spice-widget.c					\
 	spice-grabsequence.c				\
+	usb-device-widget.c				\
 	$(NULL)
 
 SpiceClientGLib-2.0.gir: libspice-client-glib-2.0.la