/soc/2013/ankitkv/gobjectification: 77a5c789fff1: Merge gtkdoc-c...
Ankit Vani
a at nevitus.org
Mon Feb 3 16:21:10 EST 2014
Changeset: 77a5c789fff1e38ecd14570389bfa43d824caa34
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-04 02:32 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/77a5c789fff1
Description:
Merge gtkdoc-conversion
diffstat:
doc/reference/libpurple/Makefile.am | 1 +
doc/reference/libpurple/libpurple-docs.xml | 47 ++++++++++++++---------------
libpurple/purple-socket.h | 11 +++---
libpurple/request-datasheet.h | 12 ++++---
libpurple/request.h | 12 ++++---
libpurple/roomlist.h | 11 +++---
libpurple/savedstatuses.h | 14 +++++---
libpurple/server.h | 12 ++++---
libpurple/signals.h | 13 +++++---
libpurple/smiley.h | 11 +++---
libpurple/sound-theme-loader.h | 10 +++--
libpurple/sound-theme.h | 10 +++--
libpurple/sound.h | 14 +++++---
libpurple/sslconn.h | 12 ++++---
libpurple/status.h | 11 ++++--
libpurple/stringref.h | 12 ++++---
libpurple/stun.h | 12 ++++---
libpurple/theme-loader.h | 10 +++--
libpurple/theme-manager.h | 10 +++--
libpurple/theme.h | 10 +++--
libpurple/upnp.h | 11 +++---
libpurple/util.h | 12 ++++---
libpurple/whiteboard.h | 9 +++-
libpurple/xfer.h | 14 +++++---
libpurple/xmlnode.h | 12 ++++---
25 files changed, 179 insertions(+), 134 deletions(-)
diffs (truncated from 737 to 300 lines):
diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am
--- a/doc/reference/libpurple/Makefile.am
+++ b/doc/reference/libpurple/Makefile.am
@@ -72,6 +72,7 @@ IGNORE_HFILES=\
dbus-types.h \
glibcompat.h \
internal.h \
+ marshallers.h \
purple-client.h \
purple-client-bindings.h
valgrind.h
diff --git a/doc/reference/libpurple/libpurple-docs.xml b/doc/reference/libpurple/libpurple-docs.xml
--- a/doc/reference/libpurple/libpurple-docs.xml
+++ b/doc/reference/libpurple/libpurple-docs.xml
@@ -28,7 +28,6 @@
<reference label="II">
<title>API Reference</title>
- <xi:include href="xml/purple.xml" />
<xi:include href="xml/account.xml" />
<xi:include href="xml/accountopt.xml" />
<xi:include href="xml/accounts.xml" />
@@ -36,66 +35,66 @@
<xi:include href="xml/blistnodetypes.xml" />
<xi:include href="xml/buddylist.xml" />
<xi:include href="xml/buddyicon.xml" />
- <xi:include href="xml/certificate.xml" />
+ <xi:include href="xml/pounce.xml" />
+ <xi:include href="xml/circularbuffer.xml" />
<xi:include href="xml/cipher.xml" />
- <xi:include href="xml/circularbuffer.xml" />
<xi:include href="xml/cmds.xml" />
<xi:include href="xml/connection.xml" />
<xi:include href="xml/conversation.xml" />
<xi:include href="xml/conversationtypes.xml" />
<xi:include href="xml/conversations.xml" />
- <xi:include href="xml/core.xml" />
<xi:include href="xml/dbus-maybe.xml" />
<xi:include href="xml/debug.xml" />
- <xi:include href="xml/desktopitem.xml" />
<xi:include href="xml/dnsquery.xml" />
<xi:include href="xml/dnssrv.xml" />
<xi:include href="xml/e2ee.xml" />
<xi:include href="xml/eventloop.xml" />
+ <xi:include href="xml/xfer.xml" />
+ <xi:include href="xml/purple-socket.xml" />
<xi:include href="xml/http.xml" />
<xi:include href="xml/idle.xml" />
<xi:include href="xml/imgstore.xml" />
<xi:include href="xml/keyring.xml" />
<xi:include href="xml/log.xml" />
- <xi:include href="xml/marshallers.xml" />
+ <xi:include href="xml/desktopitem.xml" />
<xi:include href="xml/mime.xml" />
<xi:include href="xml/nat-pmp.xml" />
<xi:include href="xml/network.xml" />
<xi:include href="xml/notify.xml" />
<xi:include href="xml/ntlm.xml" />
+ <xi:include href="xml/plugins.xml" />
+ <xi:include href="xml/prefs.xml" />
<xi:include href="xml/pluginpref.xml" />
- <xi:include href="xml/plugins.xml" />
- <xi:include href="xml/pounce.xml" />
- <xi:include href="xml/prefs.xml" />
<xi:include href="xml/presence.xml" />
<xi:include href="xml/protocol.xml" />
<xi:include href="xml/protocols.xml" />
<xi:include href="xml/proxy.xml" />
- <xi:include href="xml/purple-socket.xml" />
+ <xi:include href="xml/certificate.xml" />
+ <xi:include href="xml/signals.xml" />
+ <xi:include href="xml/stringref.xml" />
<xi:include href="xml/request.xml" />
<xi:include href="xml/request-datasheet.xml" />
<xi:include href="xml/roomlist.xml" />
<xi:include href="xml/savedstatuses.xml" />
<xi:include href="xml/server.xml" />
- <xi:include href="xml/signals.xml" />
<xi:include href="xml/smiley.xml" />
- <xi:include href="xml/sound-theme-loader.xml" />
- <xi:include href="xml/sound-theme.xml" />
<xi:include href="xml/sound.xml" />
<xi:include href="xml/sslconn.xml" />
+ <xi:include href="xml/core.xml" />
<xi:include href="xml/status.xml" />
- <xi:include href="xml/stringref.xml" />
<xi:include href="xml/stun.xml" />
+ <xi:include href="xml/theme.xml" />
<xi:include href="xml/theme-loader.xml" />
<xi:include href="xml/theme-manager.xml" />
- <xi:include href="xml/theme.xml" />
+ <xi:include href="xml/sound-theme.xml" />
+ <xi:include href="xml/sound-theme-loader.xml" />
<xi:include href="xml/upnp.xml" />
+ <xi:include href="xml/whiteboard.xml" />
+ <xi:include href="xml/xmlnode.xml" />
+ <xi:include href="xml/version.xml" />
<xi:include href="xml/util.xml" />
- <xi:include href="xml/version.xml" />
- <xi:include href="xml/whiteboard.xml" />
- <xi:include href="xml/xfer.xml" />
- <xi:include href="xml/xmlnode.xml" />
<xi:include href="xml/enums.xml" />
+ <xi:include href="xml/purple.xml" />
</reference>
<reference label="">
@@ -103,8 +102,8 @@
<title>Ciphers and Hashes</title>
<xi:include href="xml/aescipher.xml" />
+ <xi:include href="xml/descipher.xml" />
<xi:include href="xml/des3cipher.xml" />
- <xi:include href="xml/descipher.xml" />
<xi:include href="xml/hmaccipher.xml" />
<xi:include href="xml/pbkdf2cipher.xml" />
<xi:include href="xml/rc4cipher.xml" />
@@ -118,11 +117,11 @@
<title>Media APIs</title>
<xi:include href="xml/media.xml" />
+ <xi:include href="xml/media-gst.xml" />
<xi:include href="xml/mediamanager.xml" />
- <xi:include href="xml/media-gst.xml" />
- <xi:include href="xml/backend-iface.xml" />
<xi:include href="xml/candidate.xml" />
<xi:include href="xml/codec.xml" />
+ <xi:include href="xml/backend-iface.xml" />
<xi:include href="xml/enum-types.xml" />
</reference>
@@ -147,14 +146,14 @@
<xi:include href="signals_conversation.xml" />
<xi:include href="signals_core.xml" />
<xi:include href="signals_dbus_server.xml" />
- <xi:include href="signals_imgstore.xml" />
+ <xi:include href="signals_xfer.xml" />
<xi:include href="signals_log.xml" />
<xi:include href="signals_notify.xml" />
<xi:include href="signals_plugin.xml" />
<xi:include href="signals_protocol.xml" />
<xi:include href="signals_savedstatus.xml" />
<xi:include href="signals_sound.xml" />
- <xi:include href="signals_xfer.xml" />
+ <xi:include href="signals_imgstore.xml" />
<xi:include href="signals_jabber.xml" />
</reference>
diff --git a/libpurple/purple-socket.h b/libpurple/purple-socket.h
--- a/libpurple/purple-socket.h
+++ b/libpurple/purple-socket.h
@@ -1,8 +1,3 @@
-/**
- * @file purple-socket.h Generic sockets
- * @ingroup core
- */
-
/* purple
*
* Purple is the legal property of its developers, whose names are too numerous
@@ -23,6 +18,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+/**
+ * SECTION:purple-socket
+ * @section_id: libpurple-purple-socket
+ * @short_description: <filename>purple-socket.h</filename>
+ * @title: Generic sockets
+ */
#ifndef _PURPLE_SOCKET_H_
#define _PURPLE_SOCKET_H_
diff --git a/libpurple/request-datasheet.h b/libpurple/request-datasheet.h
--- a/libpurple/request-datasheet.h
+++ b/libpurple/request-datasheet.h
@@ -1,8 +1,3 @@
-/**
- * @file request-datasheet.h Request Datasheet API
- * @ingroup core
- */
-
/* purple
*
* Purple is the legal property of its developers, whose names are too numerous
@@ -23,6 +18,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+/**
+ * SECTION:request-datasheet
+ * @section_id: libpurple-request-datasheet
+ * @short_description: <filename>request-datasheet.h</filename>
+ * @title: Request Datasheet API
+ */
+
#ifndef _PURPLE_REQUEST_DATA_H_
#define _PURPLE_REQUEST_DATA_H_
diff --git a/libpurple/request.h b/libpurple/request.h
--- a/libpurple/request.h
+++ b/libpurple/request.h
@@ -1,8 +1,3 @@
-/**
- * @file request.h Request API
- * @ingroup core
- */
-
/* purple
*
* Purple is the legal property of its developers, whose names are too numerous
@@ -23,6 +18,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+/**
+ * SECTION:request
+ * @section_id: libpurple-request
+ * @short_description: <filename>request.h</filename>
+ * @title: Request API
+ */
+
#ifndef _PURPLE_REQUEST_H_
#define _PURPLE_REQUEST_H_
diff --git a/libpurple/roomlist.h b/libpurple/roomlist.h
--- a/libpurple/roomlist.h
+++ b/libpurple/roomlist.h
@@ -1,8 +1,3 @@
-/**
- * @file roomlist.h Room List API
- * @ingroup core
- */
-
/* purple
*
* Purple is the legal property of its developers, whose names are too numerous
@@ -23,6 +18,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+/**
+ * SECTION:roomlist
+ * @section_id: libpurple-roomlist
+ * @short_description: <filename>roomlist.h</filename>
+ * @title: Room List API
+ */
#ifndef _PURPLE_ROOMLIST_H_
#define _PURPLE_ROOMLIST_H_
diff --git a/libpurple/savedstatuses.h b/libpurple/savedstatuses.h
--- a/libpurple/savedstatuses.h
+++ b/libpurple/savedstatuses.h
@@ -1,9 +1,3 @@
-/**
- * @file savedstatuses.h Saved Status API
- * @ingroup core
- * @see @ref savedstatus-signals
- */
-
/* purple
*
* Purple is the legal property of its developers, whose names are too numerous
@@ -24,6 +18,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+/**
+ * SECTION:savedstatuses
+ * @section_id: libpurple-savedstatuses
+ * @short_description: <filename>savedstatuses.h</filename>
+ * @title: Saved Status API
+ * @see_also: <link linkend="chapter-signals-savedstatus">Saved Status signals</link>
+ */
+
#ifndef _PURPLE_SAVEDSTATUSES_H_
#define _PURPLE_SAVEDSTATUSES_H_
diff --git a/libpurple/server.h b/libpurple/server.h
--- a/libpurple/server.h
+++ b/libpurple/server.h
@@ -1,8 +1,3 @@
-/**
- * @file server.h Server API
- * @ingroup core
- */
-
/* purple
*
* Purple is the legal property of its developers, whose names are too numerous
@@ -23,6 +18,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+/**
+ * SECTION:server
+ * @section_id: libpurple-server
+ * @short_description: <filename>server.h</filename>
+ * @title: Server API
+ */
More information about the Commits
mailing list