/soc/2013/ankitkv/gobjectification: 1e7b4b3741a0: Merge gtkdoc-c...
Ankit Vani
a at nevitus.org
Thu Feb 6 06:24:50 EST 2014
Changeset: 1e7b4b3741a07ce0130baead2f53774a7c62f796
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-06 16:53 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/1e7b4b3741a0
Description:
Merge gtkdoc-conversion
diffstat:
configure.ac | 2 +-
libpurple/account.h | 19 +-
libpurple/certificate.h | 2 +-
libpurple/cmds.h | 24 +-
libpurple/connection.h | 6 +-
libpurple/conversation.h | 4 +-
libpurple/dbus-maybe.h | 1 -
libpurple/dbus-server.h | 8 +-
libpurple/debug.h | 6 +-
libpurple/dnssrv.c | 4 +-
libpurple/enums.h.in | 2 +-
libpurple/eventloop.h | 5 +-
libpurple/idle.h | 6 +-
libpurple/internal.h | 10 -
libpurple/media/backend-iface.h | 6 +-
libpurple/notify.h | 11 +-
libpurple/plugins/ssl/ssl-nss.c | 42 +
libpurple/protocols.h | 18 +-
libpurple/protocols/msn/msg.c | 67 +-
libpurple/request.h | 6 +-
libpurple/sound.h | 6 +-
libpurple/sslconn.h | 16 +-
libpurple/upnp.h | 6 +-
libpurple/util.h | 28 +-
libpurple/whiteboard.h | 50 +-
libpurple/xfer.h | 6 +-
libpurple/xmlnode.h | 10 +-
pidgin/gtkdialogs.c | 62 +-
po/README | 2 +-
po/hy.po | 14192 ---------------------------
po/kk.po | 19750 ++++++++++++++++++++++++++++++++++++++
po/lo.po | 14191 ---------------------------
po/ms_MY.po | 14153 ---------------------------
33 files changed, 19991 insertions(+), 42730 deletions(-)
diffs (truncated from 63386 to 300 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -306,7 +306,7 @@ if test x$enable_i18n = xyes; then
GETTEXT_PACKAGE=pidgin
AC_SUBST(GETTEXT_PACKAGE)
- ALL_LINGUAS="af am ar ast az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu hy id it ja ka km kn ko ku lo lt mai mhr mk mn mr ms_MY my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
+ ALL_LINGUAS="af am ar ast az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ku lt mai mhr mk mn mr my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
AM_GLIB_GNU_GETTEXT
dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
diff --git a/libpurple/account.h b/libpurple/account.h
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -343,7 +343,7 @@ void purple_account_set_username(PurpleA
*
* The password in the keyring might not be immediately updated, but the cached
* version will be, and it is therefore safe to read the password back before
- * the callback has been triggered. One can also set a NULL callback if
+ * the callback has been triggered. One can also set a %NULL callback if
* notification of saving to the keyring is not required.
*/
void purple_account_set_password(PurpleAccount *account, const gchar *password,
@@ -458,7 +458,7 @@ void purple_account_set_status_types(Pur
* @status_id: The ID of the status.
* @active: Whether @a status_id is to be activated (%TRUE) or
* deactivated (%FALSE).
- * @...: A NULL-terminated list of pairs of <type>const char *</type>
+ * @...: A %NULL-terminated list of pairs of <type>const char *</type>
* attribute name followed by <type>const char *</type> attribute
* value for the status. (For example, one pair might be
* <literal>"message"</literal> followed by
@@ -494,13 +494,13 @@ void purple_account_set_status_list(Purp
/**
* purple_account_set_public_alias:
* @account: The account
- * @alias: The new public alias for this account or NULL
+ * @alias: The new public alias for this account or %NULL
* to unset the alias/nickname (or return it to
* a protocol-specific "default", like the username)
* @success_cb: A callback which will be called if the alias
- * is successfully set on the server (or NULL).
+ * is successfully set on the server (or %NULL).
* @failure_cb: A callback which will be called if the alias
- * is not successfully set on the server (or NULL).
+ * is not successfully set on the server (or %NULL).
*
* Set a server-side (public) alias for this account. The account
* must already be connected.
@@ -993,10 +993,7 @@ PurpleStatus *purple_account_get_active_
*
* Returns the account status with the specified ID.
*
- * Note that this works differently than purple_buddy_get_status() in that
- * it will only return NULL if the status was not registered.
- *
- * Returns: The status, or NULL if it was never registered.
+ * Returns: The status, or %NULL if it was never registered.
*/
PurpleStatus *purple_account_get_status(const PurpleAccount *account,
const char *status_id);
@@ -1008,7 +1005,7 @@ PurpleStatus *purple_account_get_status(
*
* Returns the account status type with the specified ID.
*
- * Returns: The status type if found, or NULL.
+ * Returns: The status type if found, or %NULL.
*/
PurpleStatusType *purple_account_get_status_type(const PurpleAccount *account,
const char *id);
@@ -1023,7 +1020,7 @@ PurpleStatusType *purple_account_get_sta
* PurpleStatusType with the same primitive. In this case, the
* first PurpleStatusType is returned.
*
- * Returns: The status if found, or NULL.
+ * Returns: The status if found, or %NULL.
*/
PurpleStatusType *purple_account_get_status_type_with_primitive(
const PurpleAccount *account,
diff --git a/libpurple/certificate.h b/libpurple/certificate.h
--- a/libpurple/certificate.h
+++ b/libpurple/certificate.h
@@ -296,7 +296,7 @@ struct _PurpleCertificateScheme
* @destroy_request: Destroy a completed Request under this Verifier. The
* function pointed to here is only responsible for
* cleaning up whatever
- * #PurpleCertificateVerificationRequest::data points to.
+ * #PurpleCertificateVerificationRequest.data points to.
* It should not call free(@vrq).
* <sbr/>@vrq: The request to destroy.
*
diff --git a/libpurple/cmds.h b/libpurple/cmds.h
--- a/libpurple/cmds.h
+++ b/libpurple/cmds.h
@@ -141,18 +141,18 @@ G_BEGIN_DECLS
* the flag #PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS is passed in @f.
* This string should contain no whitespace, and use a single
* character for each argument. The recognized characters are:
- * <ul>
- * <li><literal>'w'</literal>: Matches a single word.</li>
- * <li><literal>'W'</literal>: Matches a single word, with
- * formatting.</li>
- * <li><literal>'s'</literal>: Matches the rest of the arguments
- * after this point, as a single
- * string.</li>
- * <li><literal>'S'</literal>: Same as <literal>'s'</literal> but
- * with formatting.</li>
- * </ul>
- * If args is the empty string, then the command accepts no arguments.
- * The args passed to the callback @func will be a %NULL
+ * <itemizedlist>
+ * <listitem><literal>'w'</literal>: Matches a single word.</listitem>
+ * <listitem><literal>'W'</literal>: Matches a single word, with
+ * formatting.</listitem>
+ * <listitem><literal>'s'</literal>: Matches the rest of the
+ * arguments after this point,
+ * as a single string.</listitem>
+ * <listitem><literal>'S'</literal>: Same as <literal>'s'</literal>
+ * but with formatting.</listitem>
+ * </itemizedlist>
+ * If args is the empty string, then the command accepts no
+ * arguments. The args passed to the callback @func will be a %NULL
* terminated array of %NULL terminated strings, and will always
* match the number of arguments asked for, unless
* #PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS is passed.
diff --git a/libpurple/connection.h b/libpurple/connection.h
--- a/libpurple/connection.h
+++ b/libpurple/connection.h
@@ -43,6 +43,8 @@ typedef struct _PurpleConnectionClass Pu
typedef struct _PurpleConnectionUiOps PurpleConnectionUiOps;
+typedef struct _PurpleConnectionErrorInfo PurpleConnectionErrorInfo;
+
/**
* PurpleConnectionFlags:
* @PURPLE_CONNECTION_FLAG_HTML: Connection sends/receives in 'HTML'
@@ -177,11 +179,11 @@ typedef enum
*
* Holds the type of an error along with its description.
*/
-typedef struct
+struct _PurpleConnectionErrorInfo
{
PurpleConnectionError type;
char *description;
-} PurpleConnectionErrorInfo;
+};
#include <time.h>
diff --git a/libpurple/conversation.h b/libpurple/conversation.h
--- a/libpurple/conversation.h
+++ b/libpurple/conversation.h
@@ -205,10 +205,10 @@ struct _PurpleConversationClass {
* @destroy_conversation: Called just before @conv is freed.
* @write_chat: Write a message to a chat. If this field is %NULL, libpurple
* will fall back to using @write_conv.
- * See purple_chat_conversation_write().
+ * See purple_conversation_write().
* @write_im: Write a message to an IM conversation. If this field is %NULL,
* libpurple will fall back to using @write_conv.
- * See purple_im_conversation_write().
+ * See purple_conversation_write().
* @write_conv: Write a message to a conversation. This is used rather than the
* chat- or im-specific ops for errors, system messages (such as "x
* is now know as y"), and as the fallback if @write_im and
diff --git a/libpurple/dbus-maybe.h b/libpurple/dbus-maybe.h
--- a/libpurple/dbus-maybe.h
+++ b/libpurple/dbus-maybe.h
@@ -35,7 +35,6 @@
}
#define PURPLE_DBUS_UNREGISTER_POINTER(ptr)
-#define DBUS_EXPORT
#endif /* HAVE_DBUS */
diff --git a/libpurple/dbus-server.h b/libpurple/dbus-server.h
--- a/libpurple/dbus-server.h
+++ b/libpurple/dbus-server.h
@@ -157,7 +157,7 @@ void purple_dbus_signal_emit_purple(cons
* purple_dbus_get_init_error:
*
* Returns whether Purple's D-BUS subsystem is up and running. If it's
- * NOT running then purple_dbus_dispatch_init() failed for some reason,
+ * NOT running then #purple_dbus_dispatch_init failed for some reason,
* and a message should have been purple_debug_error()'ed.
*
* Purple plugins that use D-BUS should use the
@@ -165,9 +165,9 @@ void purple_dbus_signal_emit_purple(cons
* initialization if Purple's D-BUS subsystem is not running.
*
* Returns: If the D-BUS subsystem started with no problems then this
- * will return NULL and everything will be hunky dory. If
- * there was an error initializing the D-BUS subsystem then
- * this will return an error message explaining why.
+ * will return NULL and everything will be hunky dory. If
+ * there was an error initializing the D-BUS subsystem then
+ * this will return an error message explaining why.
*/
const char *purple_dbus_get_init_error(void);
diff --git a/libpurple/debug.h b/libpurple/debug.h
--- a/libpurple/debug.h
+++ b/libpurple/debug.h
@@ -31,6 +31,8 @@
#include <glib.h>
#include <stdarg.h>
+typedef struct _PurpleDebugUiOps PurpleDebugUiOps;
+
/**
* PurpleDebugLevel:
* @PURPLE_DEBUG_ALL: All debug levels.
@@ -58,7 +60,7 @@ typedef enum
*
* Debug UI operations.
*/
-typedef struct
+struct _PurpleDebugUiOps
{
void (*print)(PurpleDebugLevel level, const char *category,
const char *arg_s);
@@ -70,7 +72,7 @@ typedef struct
void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void);
void (*_purple_reserved4)(void);
-} PurpleDebugUiOps;
+};
G_BEGIN_DECLS
diff --git a/libpurple/dnssrv.c b/libpurple/dnssrv.c
--- a/libpurple/dnssrv.c
+++ b/libpurple/dnssrv.c
@@ -742,7 +742,7 @@ purple_srv_resolve(PurpleAccount *accoun
proxy_type = purple_proxy_info_get_type(
purple_proxy_get_setup(account));
if (proxy_type == PURPLE_PROXY_TOR) {
- purple_debug_info("dnssrv", "Aborting SRV lookup in Tor Proxy mode.");
+ purple_debug_info("dnssrv", "Aborting SRV lookup in Tor Proxy mode.\n");
cb(NULL, 0, extradata);
return NULL;
}
@@ -862,7 +862,7 @@ PurpleSrvTxtQueryData *purple_txt_resolv
proxy_type = purple_proxy_info_get_type(
purple_proxy_get_setup(account));
if (proxy_type == PURPLE_PROXY_TOR) {
- purple_debug_info("dnssrv", "Aborting TXT lookup in Tor Proxy mode.");
+ purple_debug_info("dnssrv", "Aborting TXT lookup in Tor Proxy mode.\n");
cb(NULL, extradata);
return NULL;
}
diff --git a/libpurple/enums.h.in b/libpurple/enums.h.in
--- a/libpurple/enums.h.in
+++ b/libpurple/enums.h.in
@@ -25,7 +25,7 @@
* @short_description: <filename>enums.h</filename>
* @title: GEnums and GFlags
*
- * This file contains all the #GEnum and #GFlag type definitions of libpurple.
+ * This file contains all the #GEnum and #GFlags type definitions of libpurple.
*/
#ifndef PURPLE_ENUMS_H
diff --git a/libpurple/eventloop.h b/libpurple/eventloop.h
--- a/libpurple/eventloop.h
+++ b/libpurple/eventloop.h
@@ -221,7 +221,8 @@ guint purple_input_add(int fd, PurpleInp
/**
* purple_input_remove:
* @handle: The handle of the input handler. Note that this is the return
- * value from purple_input_add(), <i>not</i> the file descriptor.
+ * value from purple_input_add(), <emphasis>not</emphasis> the
+ * file descriptor.
*
* Removes an input handler.
*/
@@ -240,7 +241,7 @@ gboolean purple_input_remove(guint handl
* implement the input_get_error UI op.
*
* Returns: 0 if there is no error; -1 if there is an error, in which case
- * %errno will be set.
+ * #errno will be set.
*/
int
purple_input_get_error(int fd, int *error);
diff --git a/libpurple/idle.h b/libpurple/idle.h
--- a/libpurple/idle.h
+++ b/libpurple/idle.h
@@ -30,12 +30,14 @@
#include <time.h>
+typedef struct _PurpleIdleUiOps PurpleIdleUiOps;
+
/**
* PurpleIdleUiOps:
More information about the Commits
mailing list