pidgin/pidgin

Merged in default (pull request #656)

17 months ago, Gary Kramlich
b82ecf28c2e4
Merged in default (pull request #656)

Add 2.1x.y Since tags and fix some missing docs

Approved-by: Gary Kramlich
--- a/ChangeLog.API Fri Nov 22 04:10:26 2019 +0000
+++ b/ChangeLog.API Fri Nov 22 08:36:37 2019 +0000
@@ -326,7 +326,8 @@
* _XMLNodeType
* account-authorization-requested-with-message signal
* network-configuration-changed signal
- * PurpleAccoun->ui_data
+ * PurpleAccount->ui_data
+ * PurpleAccountPrefsUiOps
* purple_account_add_buddies_with_invite
* purple_account_add_buddy_with_invite
* purple_account_set_current_error
@@ -342,10 +343,13 @@
* purple_buddy_icons_find_custom_icon
* purple_buddy_icons_set_custom_icon
* purple_build_dir. Use g_mkdir_with_parents instead
- * purple_certificate_check_signature_chain_with_failing. Use
- purple_certificate_check_signature_chain, instead
- * purple_certificate_display_x509. Use purple_request_certificate,
- instead
+ * PurpleCertificateScheme
+ * PURPLE_CERTIFICATE_SCHEME_HAS_FUNC
+ * purple_certificate_check_signature_chain
+ * purple_certificate_check_signature_chain_with_failing
+ * purple_certificate_compare_pubkeys
+ * purple_certificate_display_x509
+ * purple_certificate_get_fingerprint_sha256
* Purple Cipher API (PurpleCipherContext and friends).
Use GLib's GHmac or GChecksum instead.
* purple_connection_error_reason
@@ -433,9 +437,11 @@
* PurplePluginProtocolInfo
* purple_proxy_connect_socks5
* purple_quotedp_decode. See the GMime library if needed.
+ * purple_request_certificate
* purple_request_field_list_add
* purple_srv_cancel
* purple_srv_resolve_account
+ * purple_srv_txt_query_destroy
* purple_ssl_connect_fd
* purple_status_set_attr_boolean
* purple_status_set_attr_int
@@ -586,84 +592,11 @@
* _GntTreeColumnFlag
* _GntWidgetFlags
-version 2.13.0:
- libpurple:
- Added:
- * purple_uri_escape_for_open
-
-version 2.12.0:
- libpurple:
- Added:
- * PURPLE_MESSAGE_REMOTE_SEND in PurpleMessageFlags, to specify
- messages like _SEND that were sent from another location.
- * purple_certificate_get_fingerprint_sha256
- * purple_certificate_compare_pubkeys
- * PurpleCertificateScheme.get_fingerprint_sha256
- * PurpleCertificateScheme.compare_pubkeys
- * PURPLE_CERTIFICATE_SCHEME_HAS_FUNC
-
version 2.11.0:
libpurple:
Added:
* account-status-changing signal (account signals)
* buddy-removed-from-group signal (blist signals)
- * PurpleCommandsUiOps, to allow the UI to override the
- built-in handling of commands.
- * PurplePrefsUiOps, to allow the UI to override the way global
- preferences are stored.
- * PurpleAccountPrefsUiOps, to allow the UI to handle storage
- of account preferences.
- * purple_media_set_encryption_parameters
- * purple_media_set_decryption_parameters
- * purple_xfer_write_file
- * purple_xfer_read_file
- * purple_media_set_send_rtcp_mux
- * purple_media_backend_set_send_rtcp_mux
-
-version 2.10.12:
- * No changes
-
-version 2.10.11:
- * No changes
-
-version 2.10.10:
- * No changes
-
-version 2.10.9:
- * No changes
-
-version 2.10.8:
- * No changes
-
-version 2.10.7:
- * No changes
-
-version 2.10.6:
- * No changes
-
-version 2.10.5:
- * No changes
-
-version 2.10.4:
- * No changes
-
-version 2.10.3:
- * No changes
-
-version 2.10.2:
- * No changes
-
-version 2.10.1:
- * No changes
-
-version 2.10.0:
- libpurple:
- Added:
- * purple_srv_txt_query_destroy (accidentally left out of 2.8.0)
-
- Pidgin:
- Added:
- * pidgin_dialogs_plugins_info (should not be used by anything but Pidgin)
version 2.9.0:
libpurple:
--- a/doc/reference/finch/finch-docs.xml Fri Nov 22 04:10:26 2019 +0000
+++ b/doc/reference/finch/finch-docs.xml Fri Nov 22 08:36:37 2019 +0000
@@ -45,14 +45,19 @@
<xi:include href="xml/finch.xml" />
</part>
- <index id="api-index-full">
- <title>Index</title>
- <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
- </index>
- <index id="api-index-deprecated" role="deprecated">
- <title>Index of deprecated symbols</title>
- <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
- </index>
+ <part>
+ <title>Appendices</title>
+
+ <index id="api-index-full">
+ <title>API Index</title>
+ <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+ </index>
- <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+ <index id="api-deprecated">
+ <title>Index of deprecated symbols</title>
+ <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+ </index>
+
+ <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+ </part>
</book>
--- a/doc/reference/libpurple/libpurple-docs.xml Fri Nov 22 04:10:26 2019 +0000
+++ b/doc/reference/libpurple/libpurple-docs.xml Fri Nov 22 08:36:37 2019 +0000
@@ -156,22 +156,32 @@
<xi:include href="plugin_i18n.xml" />
<xi:include href="ui_ops.xml" />
- <index id="api-index-full">
- <title>Index</title>
- <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
- </index>
- <index id="api-index-deprecated" role="deprecated">
- <title>Index of deprecated symbols</title>
- <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
- </index>
- <index id="api-index-2-11-0" role="2.11.0">
- <title>Index of new symbols in 2.11.0</title>
- <xi:include href="xml/api-index-2.11.0.xml"><xi:fallback /></xi:include>
- </index>
- <index id="api-index-3-0-0" role="3.0.0">
- <title>Index of new symbols in 3.0.0</title>
- <xi:include href="xml/api-index-3.0.0.xml"><xi:fallback /></xi:include>
- </index>
+ <part>
+ <title>Appendices</title>
+
+ <index id="api-index-full">
+ <title>API Index</title>
+ <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+ </index>
+
+ <index id="api-deprecated">
+ <title>Index of deprecated symbols</title>
+ <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+ </index>
- <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+ <index id="api-3.0.0">
+ <title>Index of new symbols in 3.0.0</title>
+ <xi:include href="xml/api-index-3.0.0.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-2.13.0">
+ <title>Index of new symbols in 2.13.0</title>
+ <xi:include href="xml/api-index-2.13.0.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-2.11.0">
+ <title>Index of new symbols in 2.11.0</title>
+ <xi:include href="xml/api-index-2.11.0.xml"><xi:fallback /></xi:include>
+ </index>
+
+ <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+ </part>
</book>
--- a/doc/reference/pidgin/pidgin-docs.xml Fri Nov 22 04:10:26 2019 +0000
+++ b/doc/reference/pidgin/pidgin-docs.xml Fri Nov 22 08:36:37 2019 +0000
@@ -55,8 +55,12 @@
<xi:include href="xml/minidialog.xml" />
<xi:include href="xml/pidgin.xml" />
<xi:include href="xml/pidginabout.xml" />
+ <xi:include href="xml/pidginaccountchooser.xml" />
+ <xi:include href="xml/pidgincontactcompletion.xml" />
<xi:include href="xml/pidgindebug.xml" />
<xi:include href="xml/pidgingdkpixbuf.xml" />
+ <xi:include href="xml/pidginicon.xml" />
+ <xi:include href="xml/pidgininvitedialog.xml" />
<xi:include href="xml/pidginlog.xml" />
<xi:include href="xml/pidginmenutray.xml" />
<xi:include href="xml/pidginmessage.xml" />
@@ -76,14 +80,28 @@
<xi:include href="signals_gtklog.xml" />
</part>
- <index id="api-index-full">
- <title>Index</title>
- <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
- </index>
- <index id="api-index-deprecated" role="deprecated">
- <title>Index of deprecated symbols</title>
- <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
- </index>
+ <part>
+ <title>Appendices</title>
+
+ <index id="api-index-full">
+ <title>API Index</title>
+ <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+ </index>
+
+ <index id="api-deprecated">
+ <title>Index of deprecated symbols</title>
+ <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+ </index>
- <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+ <index id="api-3.0.0">
+ <title>Index of new symbols in 3.0.0</title>
+ <xi:include href="xml/api-index-3.0.0.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-2.10.0">
+ <title>Index of new symbols in 2.10.0</title>
+ <xi:include href="xml/api-index-2.10.0.xml"><xi:fallback /></xi:include>
+ </index>
+
+ <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+ </part>
</book>
--- a/libpurple/cmds.h Fri Nov 22 04:10:26 2019 +0000
+++ b/libpurple/cmds.h Fri Nov 22 08:36:37 2019 +0000
@@ -160,6 +160,8 @@
*
* See <link linkend="chapter-ui-ops">List of <literal>UiOps</literal>
* Structures</link>
+ *
+ * Since: 2.11.0
*/
typedef struct {
void (*register_command)(const gchar *name, PurpleCmdPriority priority,
--- a/libpurple/conversation.h Fri Nov 22 04:10:26 2019 +0000
+++ b/libpurple/conversation.h Fri Nov 22 08:36:37 2019 +0000
@@ -127,6 +127,7 @@
* @PURPLE_MESSAGE_INVISIBLE: Message should not be displayed
* @PURPLE_MESSAGE_REMOTE_SEND: Message sent from another location,
* not an echo of a local one
+ * Since: 2.12.0
*
* Flags applicable to a message. Most will have send, recv or system.
*/
--- a/libpurple/media.h Fri Nov 22 04:10:26 2019 +0000
+++ b/libpurple/media.h Fri Nov 22 08:36:37 2019 +0000
@@ -383,6 +383,8 @@
* @key_len: Byte length of the encryption key.
*
* Sets the encryption parameters of our media in the session.
+ *
+ * Since: 2.11.0
*/
gboolean purple_media_set_encryption_parameters(PurpleMedia *media,
const gchar *sess_id, const gchar *cipher,
@@ -401,6 +403,8 @@
* @key_len: Byte length of the decryption key.
*
* Sets the decryption parameters for a session participant's media.
+ *
+ * Since: 2.11.0
*/
gboolean purple_media_set_decryption_parameters(PurpleMedia *media,
const gchar *sess_id, const gchar *participant,
@@ -429,7 +433,7 @@
*
* Returns: %TRUE RTCP-Mux was set successfully, or %FALSE otherwise.
*
- * @since 2.11.0
+ * Since: 2.11.0
*/
gboolean purple_media_set_send_rtcp_mux(PurpleMedia *media,
const gchar *sess_id, const gchar *participant, gboolean send_rtcp_mux);
--- a/libpurple/media/backend-iface.h Fri Nov 22 04:10:26 2019 +0000
+++ b/libpurple/media/backend-iface.h Fri Nov 22 08:36:37 2019 +0000
@@ -288,7 +288,7 @@
*
* Returns: True if set successfully, otherwise False.
*
- * @since 2.11.0
+ * Since: 2.11.0
*/
gboolean purple_media_backend_set_send_rtcp_mux(PurpleMediaBackend *self,
const gchar *sess_id, const gchar *participant, gboolean send_rtcp_mux);
--- a/libpurple/util.h Fri Nov 22 04:10:26 2019 +0000
+++ b/libpurple/util.h Fri Nov 22 08:36:37 2019 +0000
@@ -1200,6 +1200,8 @@
*
* Returns: A newly allocated string with any shell metacharacters replaced
* with their escaped equivalents.
+ *
+ * Since: 2.13.0
*/
char *purple_uri_escape_for_open(const char *unescaped);
--- a/libpurple/xfer.h Fri Nov 22 04:10:26 2019 +0000
+++ b/libpurple/xfer.h Fri Nov 22 08:36:37 2019 +0000
@@ -611,6 +611,8 @@
* Writes chunk of received file.
*
* Returns: TRUE on success, FALSE otherwise.
+ *
+ * Since: 2.11.0
*/
gboolean
purple_xfer_write_file(PurpleXfer *xfer, const guchar *buffer, gsize size);
@@ -625,6 +627,8 @@
*
* Returns: Number of bytes written (0 means, the device is busy), or -1 on
* failure.
+ *
+ * Since: 2.11.0
*/
gssize
purple_xfer_read_file(PurpleXfer *xfer, guchar *buffer, gsize size);
--- a/pidgin/gtkdialogs.h Fri Nov 22 04:10:26 2019 +0000
+++ b/pidgin/gtkdialogs.h Fri Nov 22 08:36:37 2019 +0000
@@ -37,6 +37,13 @@
/* Functions in gtkdialogs.c (these should actually stay in this file) */
void pidgin_dialogs_destroy_all(void);
+/**
+ * pidgin_dialogs_plugins_info:
+ *
+ * This should not be used by anything but Pidgin.
+ *
+ * Since: 2.10.0
+ */
void pidgin_dialogs_plugins_info(void);
void pidgin_dialogs_im(void);
void pidgin_dialogs_im_with_user(PurpleAccount *account, const char *username);
--- a/pidgin/pidginaccountchooser.h Fri Nov 22 04:10:26 2019 +0000
+++ b/pidgin/pidginaccountchooser.h Fri Nov 22 08:36:37 2019 +0000
@@ -22,9 +22,9 @@
#ifndef PIDGIN_ACCOUNT_CHOOSER_H
#define PIDGIN_ACCOUNT_CHOOSER_H
/**
- * SECTION:pidgin-account-chooser
+ * SECTION:pidginaccountchooser
* @section_id: pidgin-account-chooser
- * @short_description: <filename>pidginaccountchooser.h</filename>
+ * @short_description: A #GtkComboBox for choosing accounts
* @title: Pidgin Account Chooser Combo Box Widget
*/
--- a/pidgin/pidginmenutray.h Fri Nov 22 04:10:26 2019 +0000
+++ b/pidgin/pidginmenutray.h Fri Nov 22 08:36:37 2019 +0000
@@ -21,9 +21,9 @@
#define PIDGIN_MENU_TRAY_H
/**
- * SECTION:gtkmenutray
- * @section_id: pidgin-gtkmenutray
- * @short_description: <filename>gtkmenutray.h</filename>
+ * SECTION:pidginmenutray
+ * @section_id: pidgin-menu-tray
+ * @short_description: <filename>pidginmenutray.h</filename>
* @title: Tray Menu Item
*/