rtsp-*: Refer to NULL as a constant in comments

Plus one typo fix.

https://bugzilla.gnome.org/show_bug.cgi?id=714988

diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c
index ed1b663..76f8c8c 100644 (file)
--- a/gst/rtsp-server/rtsp-client.c
+++ b/gst/rtsp-server/rtsp-client.c
@@ -2846,7 +2846,7 @@ client_watch_notify (GstRTSPClient * client)
  * @context: (allow-none): a #GMainContext
  *
  * Attaches @client to @context. When the mainloop for @context is run, the
- * client will be dispatched. When @context is NULL, the default context will be
+ * client will be dispatched. When @context is %NULL, the default context will be
  * used).
  *
  * This function should be called when the client properties and urls are fully

diff --git a/gst/rtsp-server/rtsp-context.h b/gst/rtsp-server/rtsp-context.h
index a43563f..9e001aa 100644 (file)
--- a/gst/rtsp-server/rtsp-context.h
+++ b/gst/rtsp-server/rtsp-context.h
@@ -43,13 +43,13 @@ typedef struct _GstRTSPContext GstRTSPContext;
  * @request: the complete request
  * @uri: the complete url parsed from @request
  * @method: the parsed method of @uri
- * @auth: the current auth object or NULL
+ * @auth: the current auth object or %NULL
  * @token: authorisation token
- * @session: the session, can be NULL
- * @sessmedia: the session media for the url can be NULL
- * @factory: the media factory for the url, can be NULL.
- * @media: the media for the url can be NULL
- * @stream: the stream for the url can be NULL
+ * @session: the session, can be %NULL
+ * @sessmedia: the session media for the url can be %NULL
+ * @factory: the media factory for the url, can be %NULL
+ * @media: the media for the url can be %NULL
+ * @stream: the stream for the url can be %NULL
  * @response: the response
  *
  * Information passed around containing the context of a request.

diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c
index e26a588..cfa3a25 100644 (file)
--- a/gst/rtsp-server/rtsp-media.c
+++ b/gst/rtsp-server/rtsp-media.c
@@ -2060,7 +2060,7 @@ not_prepared:
 /**
  * gst_rtsp_media_get_time_provider:
  * @media: a #GstRTSPMedia
- * @address: an address or NULL
+ * @address: an address or %NULL
  * @port: a port or 0
  *
  * Get the #GstNetTimeProvider for the clock used by @media. The time provider

diff --git a/gst/rtsp-server/rtsp-mount-points.c b/gst/rtsp-server/rtsp-mount-points.c
index b89f2c4..49d8d3e 100644 (file)
--- a/gst/rtsp-server/rtsp-mount-points.c
+++ b/gst/rtsp-server/rtsp-mount-points.c
@@ -225,7 +225,7 @@ has_prefix (DataItem * str, DataItem * prefix)
  *
  * Find the factory in @mounts that has the longest match with @path.
  *
- * If @matched is NULL, @path willt match the factory exactly otherwise
+ * If @matched is %NULL, @path will match the factory exactly otherwise
  * the amount of characters that matched is returned in @matched.
  *
  * Returns: (transfer full): the #GstRTSPMediaFactory for @path.

diff --git a/gst/rtsp-server/rtsp-server.c b/gst/rtsp-server/rtsp-server.c
index 364d5dc..e9b5d81 100644 (file)
--- a/gst/rtsp-server/rtsp-server.c
+++ b/gst/rtsp-server/rtsp-server.c
@@ -777,7 +777,7 @@ gst_rtsp_server_set_property (GObject * object, guint propid,
  * Create a #GSocket for @server. The socket will listen on the
  * configured service.
  *
- * Returns: (transfer full): the #GSocket for @server or NULL when an error occured.
+ * Returns: (transfer full): the #GSocket for @server or %NULL when an error occured.
  */
 GSocket *
 gst_rtsp_server_create_socket (GstRTSPServer * server,
@@ -1235,12 +1235,12 @@ watch_destroyed (GstRTSPServer * server)
  * Create a #GSource for @server. The new source will have a default
  * #GSocketSourceFunc of gst_rtsp_server_io_func().
  *
- * @cancellable if not NULL can be used to cancel the source, which will cause
+ * @cancellable if not %NULL can be used to cancel the source, which will cause
  * the source to trigger, reporting the current condition (which is likely 0
  * unless cancellation happened at the same time as a condition change). You can
  * check for this in the callback using g_cancellable_is_cancelled().
  *
- * Returns: the #GSource for @server or NULL when an error occured. Free with
+ * Returns: the #GSource for @server or %NULL when an error occured. Free with
  * g_source_unref ()
  */
 GSource *
@@ -1292,7 +1292,7 @@ no_socket:
  * @context: (allow-none): a #GMainContext
  *
  * Attaches @server to @context. When the mainloop for @context is run, the
- * server will be dispatched. When @context is NULL, the default context will be
+ * server will be dispatched. When @context is %NULL, the default context will be
  * used).
  *
  * This function should be called when the server properties and urls are fully

diff --git a/gst/rtsp-server/rtsp-token.c b/gst/rtsp-server/rtsp-token.c
index dfbb1f8..7e234e8 100644 (file)
--- a/gst/rtsp-server/rtsp-token.c
+++ b/gst/rtsp-server/rtsp-token.c
@@ -195,7 +195,7 @@ gst_rtsp_token_get_structure (GstRTSPToken * token)
  * Returns: The structure of the token. The structure is still
  * owned by the token, which means that you should not free it and
  * that the pointer becomes invalid when you free the token.
- * This function checks if @token is writable and will never return NULL.
+ * This function checks if @token is writable and will never return %NULL.
  *
  * MT safe.
  */
@@ -216,7 +216,7 @@ gst_rtsp_token_writable_structure (GstRTSPToken * token)
  *
  * Get the string value of @field in @token.
  *
- * Returns: the string value of @field in @token or NULL when @field is not
+ * Returns: the string value of @field in @token or %NULL when @field is not
  * defined in @token.
  */
 const gchar *