/soc/2013/ankitkv/gobjectification: 3373bd0b4ea6: Merge gtkdoc-c...

Ankit Vani a at nevitus.org
Mon Feb 3 18:27:27 EST 2014


Changeset: 3373bd0b4ea67ece2e2bf80f1470f0e537c61343
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-02-04 04:56 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/3373bd0b4ea6

Description:

Merge gtkdoc-conversion

diffstat:

 doc/reference/finch/Makefile.am             |   4 +++-
 doc/reference/finch/finch-docs.xml          |  23 ++++++++++++-----------
 doc/reference/pidgin/Makefile.am            |   1 +
 doc/reference/pidgin/pidgin-docs.xml        |   1 -
 finch/finch.h                               |  11 +++++++----
 finch/gntaccount.h                          |  12 +++++++-----
 finch/gntblist.h                            |  12 +++++++-----
 finch/gntcertmgr.h                          |  12 +++++++-----
 finch/gntconn.h                             |  12 +++++++-----
 finch/gntconv.h                             |  12 +++++++-----
 finch/gntdebug.h                            |  12 +++++++-----
 finch/gntidle.h                             |  12 +++++++-----
 finch/gntlog.h                              |  12 +++++++-----
 finch/gntmedia.h                            |  11 ++++++-----
 finch/gntmenuutil.h                         |  12 +++++++-----
 finch/gntnotify.h                           |  12 +++++++-----
 finch/gntplugin.h                           |  12 +++++++-----
 finch/gntpounce.h                           |  12 +++++++-----
 finch/gntprefs.h                            |  12 +++++++-----
 finch/gntrequest.h                          |  12 +++++++-----
 finch/gntroomlist.h                         |  12 +++++++-----
 finch/gntsound.h                            |  12 +++++++-----
 finch/gntstatus.h                           |  12 +++++++-----
 finch/gntui.h                               |   7 +++++++
 finch/gntxfer.h                             |  12 +++++++-----
 finch/libgnt/gnt-skel.h                     |  11 +++++++----
 finch/libgnt/gnt.h                          |  16 ++++++----------
 finch/libgnt/gntbindable.h                  |  11 +++++++----
 finch/libgnt/gntbox.h                       |  12 ++++++++----
 finch/libgnt/gntbutton.h                    |  12 ++++++++----
 finch/libgnt/gntcheckbox.h                  |  11 +++++++----
 finch/libgnt/gntclipboard.h                 |  11 +++++++----
 finch/libgnt/gntcolors.h                    |  10 ++++++----
 finch/libgnt/gntcombobox.h                  |  11 +++++++----
 finch/libgnt/gntentry.h                     |  12 ++++++++----
 finch/libgnt/gntfilesel.h                   |  12 ++++++++----
 finch/libgnt/gntkeys.h                      |  10 ++++++----
 finch/libgnt/gntlabel.h                     |  12 ++++++++----
 finch/libgnt/gntline.h                      |  11 +++++++----
 finch/libgnt/gntmenu.h                      |  11 +++++++----
 finch/libgnt/gntmenuitem.h                  |  11 +++++++----
 finch/libgnt/gntmenuitemcheck.h             |  11 +++++++----
 finch/libgnt/gntprogressbar.h               |  11 +++++++----
 finch/libgnt/gntslider.h                    |  12 ++++++++----
 finch/libgnt/gntstyle.h                     |  10 ++++++----
 finch/libgnt/gnttextview.h                  |  11 +++++++----
 finch/libgnt/gnttree.h                      |  11 +++++++----
 finch/libgnt/gntutils.h                     |  10 ++++++----
 finch/libgnt/gntwidget.h                    |  12 ++++++++----
 finch/libgnt/gntwindow.h                    |  11 +++++++----
 finch/libgnt/gntwm.h                        |  10 ++++++----
 finch/libgnt/gntws.h                        |  10 ++++++----
 libpurple/protocols/gg/oauth/oauth-purple.c |   8 ++++----
 libpurple/protocols/gg/oauth/oauth.c        |  13 +++++++++----
 libpurple/protocols/gg/oauth/oauth.h        |   4 +++-
 55 files changed, 367 insertions(+), 235 deletions(-)

diffs (truncated from 1589 to 300 lines):

diff --git a/doc/reference/finch/Makefile.am b/doc/reference/finch/Makefile.am
--- a/doc/reference/finch/Makefile.am
+++ b/doc/reference/finch/Makefile.am
@@ -64,7 +64,9 @@ IGNORE_HFILES=\
 	plugins \
 	test \
 	wms \
-	gntinternal.h
+	getopt.h \
+	gntinternal.h \
+	gntmarshal.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/doc/reference/finch/finch-docs.xml b/doc/reference/finch/finch-docs.xml
--- a/doc/reference/finch/finch-docs.xml
+++ b/doc/reference/finch/finch-docs.xml
@@ -11,8 +11,11 @@
     <abstract>
       <title>Finch &version;</title>
       <para>
-        Finch is an ncurses frontend to libpurple, built using libgnt
-        (GLib Ncurses Toolkit).
+        GNT (GLib Ncurses Toolkit) is an ncurses toolkit for creating text-mode
+        graphical user interfaces in a fast and easy way.
+      </para>
+      <para>
+        Finch is a text-mode frontend to libpurple, built using libgnt.
       </para>
     </abstract>
   </bookinfo>
@@ -20,37 +23,38 @@
   <reference label="I">
     <title>Finch API Reference</title>
 
-      <xi:include href="xml/finch.xml" />
-      <xi:include href="xml/getopt.xml" />
       <xi:include href="xml/gntaccount.xml" />
       <xi:include href="xml/gntblist.xml" />
+      <xi:include href="xml/gntpounce.xml" />
       <xi:include href="xml/gntcertmgr.xml" />
       <xi:include href="xml/gntconn.xml" />
       <xi:include href="xml/gntconv.xml" />
       <xi:include href="xml/gntdebug.xml" />
+      <xi:include href="xml/gntxfer.xml" />
       <xi:include href="xml/gntidle.xml" />
       <xi:include href="xml/gntlog.xml" />
       <xi:include href="xml/gntmedia.xml" />
       <xi:include href="xml/gntmenuutil.xml" />
       <xi:include href="xml/gntnotify.xml" />
       <xi:include href="xml/gntplugin.xml" />
-      <xi:include href="xml/gntpounce.xml" />
       <xi:include href="xml/gntprefs.xml" />
       <xi:include href="xml/gntrequest.xml" />
       <xi:include href="xml/gntroomlist.xml" />
       <xi:include href="xml/gntsound.xml" />
       <xi:include href="xml/gntstatus.xml" />
       <xi:include href="xml/gntui.xml" />
-      <xi:include href="xml/gntxfer.xml" />
+      <xi:include href="xml/finch.xml" />
   </reference>
 
   <reference label="II">
     <title>GNT API Reference</title>
 
+      <xi:include href="xml/gnt.xml" />
       <xi:include href="xml/gntbindable.xml" />
       <xi:include href="xml/gntbox.xml" />
       <xi:include href="xml/gntbutton.xml" />
       <xi:include href="xml/gntcheckbox.xml" />
+      <xi:include href="xml/gntmenuitemcheck.xml" />
       <xi:include href="xml/gntclipboard.xml" />
       <xi:include href="xml/gntcolors.xml" />
       <xi:include href="xml/gntcombobox.xml" />
@@ -59,22 +63,19 @@
       <xi:include href="xml/gntkeys.xml" />
       <xi:include href="xml/gntlabel.xml" />
       <xi:include href="xml/gntline.xml" />
-      <xi:include href="xml/gntmarshal.xml" />
-      <xi:include href="xml/gntmenuitemcheck.xml" />
+      <xi:include href="xml/gntmenu.xml" />
       <xi:include href="xml/gntmenuitem.xml" />
-      <xi:include href="xml/gntmenu.xml" />
       <xi:include href="xml/gntprogressbar.xml" />
       <xi:include href="xml/gnt-skel.xml" />
       <xi:include href="xml/gntslider.xml" />
       <xi:include href="xml/gntstyle.xml" />
       <xi:include href="xml/gnttextview.xml" />
       <xi:include href="xml/gnttree.xml" />
-      <xi:include href="xml/gntutils.xml" />
       <xi:include href="xml/gntwidget.xml" />
       <xi:include href="xml/gntwindow.xml" />
       <xi:include href="xml/gntwm.xml" />
       <xi:include href="xml/gntws.xml" />
-      <xi:include href="xml/gnt.xml" />
+      <xi:include href="xml/gntutils.xml" />
   </reference>
 
   <index id="api-index-full">
diff --git a/doc/reference/pidgin/Makefile.am b/doc/reference/pidgin/Makefile.am
--- a/doc/reference/pidgin/Makefile.am
+++ b/doc/reference/pidgin/Makefile.am
@@ -65,6 +65,7 @@ IGNORE_HFILES=\
 	plugins \
 	themes \
 	win32 \
+	getopt.h \
 	gtk3compat.h \
 	gtkinternal.h
 
diff --git a/doc/reference/pidgin/pidgin-docs.xml b/doc/reference/pidgin/pidgin-docs.xml
--- a/doc/reference/pidgin/pidgin-docs.xml
+++ b/doc/reference/pidgin/pidgin-docs.xml
@@ -19,7 +19,6 @@
   <reference label="I">
     <title>API Reference</title>
 
-      <xi:include href="xml/getopt.xml" />
       <xi:include href="xml/gtkaccount.xml" />
       <xi:include href="xml/gtkblist-theme-loader.xml" />
       <xi:include href="xml/gtkblist-theme.xml" />
diff --git a/finch/finch.h b/finch/finch.h
--- a/finch/finch.h
+++ b/finch/finch.h
@@ -1,7 +1,3 @@
-/**
- * @defgroup finch Finch (GNT User Interface)
- */
-
 /* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
@@ -22,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:finch
+ * @section_id: finch-finch
+ * @short_description: <filename>finch.h</filename>
+ * @title: Finch Application
+ */
+
 #ifndef _FINCH_H_
 #define _FINCH_H_
 
diff --git a/finch/gntaccount.h b/finch/gntaccount.h
--- a/finch/gntaccount.h
+++ b/finch/gntaccount.h
@@ -1,8 +1,3 @@
-/**
- * @file gntaccount.h GNT Account API
- * @ingroup finch
- */
-
 /* finch
  *
  * Finch 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:gntaccount
+ * @section_id: finch-gntaccount
+ * @short_description: <filename>gntaccount.h</filename>
+ * @title: Account API
+ */
+
 #ifndef _GNT_ACCOUNT_H
 #define _GNT_ACCOUNT_H
 
diff --git a/finch/gntblist.h b/finch/gntblist.h
--- a/finch/gntblist.h
+++ b/finch/gntblist.h
@@ -1,8 +1,3 @@
-/**
- * @file gntblist.h GNT BuddyList API
- * @ingroup finch
- */
-
 /* finch
  *
  * Finch 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:gntblist
+ * @section_id: finch-gntblist
+ * @short_description: <filename>gntblist.h</filename>
+ * @title: Buddy List API
+ */
+
 #ifndef _GNT_BLIST_H
 #define _GNT_BLIST_H
 
diff --git a/finch/gntcertmgr.h b/finch/gntcertmgr.h
--- a/finch/gntcertmgr.h
+++ b/finch/gntcertmgr.h
@@ -1,8 +1,3 @@
-/**
- * @file gntcertmgr.h GNT Certificate Manager API
- * @ingroup finch
- */
-
 /* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
@@ -24,6 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
+/**
+ * SECTION:gntcertmgr
+ * @section_id: finch-gntcertmgr
+ * @short_description: <filename>gntcertmgr.h</filename>
+ * @title: Certificate Manager API
+ */
+
 #ifndef _GNT_CERTMGR_H
 #define _GNT_CERTMGR_H
 
diff --git a/finch/gntconn.h b/finch/gntconn.h
--- a/finch/gntconn.h
+++ b/finch/gntconn.h
@@ -1,8 +1,3 @@
-/**
- * @file gntconn.h GNT Connection API
- * @ingroup finch
- */
-
 /* finch
  *
  * Finch 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:gntconn
+ * @section_id: finch-gntconn
+ * @short_description: <filename>gntconn.h</filename>
+ * @title: Connection API
+ */
+
 #ifndef _GNT_CONN_H
 #define _GNT_CONN_H
 
diff --git a/finch/gntconv.h b/finch/gntconv.h
--- a/finch/gntconv.h
+++ b/finch/gntconv.h
@@ -1,8 +1,3 @@
-/**
- * @file gntconv.h GNT Conversation API
- * @ingroup finch
- */
-
 /* finch
  *
  * Finch 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:gntconv
+ * @section_id: finch-gntconv
+ * @short_description: <filename>gntconv.h</filename>
+ * @title: Conversation API
+ */
+
 #ifndef _GNT_CONV_H
 #define _GNT_CONV_H
 
diff --git a/finch/gntdebug.h b/finch/gntdebug.h
--- a/finch/gntdebug.h
+++ b/finch/gntdebug.h
@@ -1,8 +1,3 @@
-/**
- * @file gntdebug.h GNT Debug API
- * @ingroup finch
- */
-
 /* finch
  *
  * Finch 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:gntdebug
+ * @section_id: finch-gntdebug
+ * @short_description: <filename>gntdebug.h</filename>
+ * @title: Debug API
+ */
+
 #ifndef _GNT_DEBUG_H



More information about the Commits mailing list