Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/facebook/util.h	Tue Dec 15 22:35:05 2015 -0500
+++ b/libpurple/protocols/facebook/util.h	Wed Dec 16 14:04:26 2015 -0500
@@ -110,7 +110,7 @@
  * @acct: The #PurpleAccount.
  * @chat: The #PurpleChatConversation.
  * @name: The name of the buddy.
- * @error: The return location for the #GError, or #NULL.
+ * @error: The return location for the #GError or #NULL.
  *
  * Finds a buddy by their name or alias.
  *
@@ -244,7 +244,7 @@
  * @title: The title of the message or #NULL.
  * @primary: The main point of the message or #NULL.
  * @secondary: The secondary information or #NULL.
- * @select: A #GSList of selected buddies, or #NULL.
+ * @select: A #GSList of selected buddies or #NULL.
  * @multi: #TRUE to for multiple buddy selections, otherwise #FALSE.
  * @ok_cb: The callback for the `OK` button or #NULL.
  * @cancel_cb: The callback for the `Cancel` button or #NULL.
@@ -320,7 +320,7 @@
 /**
  * fb_util_zcompress:
  * @bytes: The #GByteArray.
- * @error: The return location for the #GError, or #NULL.
+ * @error: The return location for the #GError or #NULL.
  *
  * Compresses a #GByteArray with zlib. The returned #GByteArray should
  * be freed with #g_byte_array_free() when no longer needed.
@@ -333,12 +333,12 @@
 /**
  * fb_util_zuncompress:
  * @bytes: The #GByteArray.
- * @error: The return location for the #GError, or #NULL.
+ * @error: The return location for the #GError or #NULL.
  *
  * Uncompresses a #GByteArray with zlib. The returned #GByteArray
  * should be freed with #g_byte_array_free() when no longer needed.
  *
- * Returns: The uncompressed #GByteArray, or #NULL on error.
+ * Returns: The uncompressed #GByteArray or #NULL on error.
  */
 GByteArray *
 fb_util_zuncompress(const GByteArray *bytes, GError **error);