/soc/2013/ankitkv/gobjectification: 18f5830bd82c: Merge gtkdoc-c...
Ankit Vani
a at nevitus.org
Mon Feb 3 15:15:50 EST 2014
Changeset: 18f5830bd82c5aba42bdc46b0a7378d8b31f9d82
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-04 01:36 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/18f5830bd82c
Description:
Merge gtkdoc-conversion
diffstat:
.hgignore | 2 +-
.hgtags | 1 +
ChangeLog | 2 +-
Makefile.am | 5 +-
configure.ac | 1 -
doc/reference/finch/finch-docs.xml | 10 +-
doc/reference/libpurple/Makefile.am | 6 +-
doc/reference/libpurple/libpurple-docs.xml | 17 +-
doc/reference/pidgin/Makefile.am | 1 +
doc/reference/pidgin/pidgin-docs.xml | 10 +-
libpurple/account.h | 2 +-
libpurple/accountopt.h | 2 +-
libpurple/accounts.h | 2 +-
libpurple/blistnode.h | 2 +-
libpurple/blistnodetypes.h | 2 +-
libpurple/conversation.h | 12 +-
libpurple/conversations.h | 14 +-
libpurple/conversationtypes.h | 12 +-
libpurple/core.h | 20 +-
libpurple/dbus-bindings.h | 11 +-
libpurple/dbus-maybe.h | 15 +-
libpurple/dbus-purple.h | 6 +
libpurple/dbus-server.h | 13 +-
libpurple/dbus-useful.h | 7 +
libpurple/debug.h | 12 +-
libpurple/desktopitem.h | 11 +-
libpurple/dnsquery.h | 12 +-
libpurple/dnssrv.h | 10 +-
libpurple/e2ee.h | 11 +-
libpurple/eventloop.h | 12 +-
libpurple/glibcompat.h | 16 +-
libpurple/http.c | 14 +-
libpurple/http.h | 11 +-
libpurple/idle.h | 12 +-
libpurple/imgstore.h | 18 +-
libpurple/internal.h | 12 +-
libpurple/keyring.c | 30 +-
libpurple/keyring.h | 11 +-
libpurple/log.h | 14 +-
libpurple/media-gst.h | 11 +-
libpurple/media.h | 11 +-
libpurple/mediamanager.h | 11 +-
libpurple/mime.h | 17 +-
libpurple/nat-pmp.h | 11 +-
libpurple/network.h | 12 +-
libpurple/notify.h | 14 +-
libpurple/ntlm.h | 10 +-
libpurple/pluginpref.h | 12 +-
libpurple/plugins/Makefile.am | 4 -
libpurple/plugins/Makefile.mingw | 1 -
libpurple/plugins/keyrings/secretservice.c | 1 -
libpurple/plugins/newline.c | 116 -
libpurple/plugins/perl/common/Makefile.PL.in | 4 +-
libpurple/plugins/perl/common/Purple.pm | 2 -
libpurple/pounce.h | 12 +-
libpurple/prefs.h | 12 +-
libpurple/presence.h | 14 +-
libpurple/protocols/gg/account.c | 104 +-
libpurple/protocols/gg/avatar.c | 32 +-
libpurple/protocols/gg/avatar.h | 2 +-
libpurple/protocols/gg/blist.c | 2 +-
libpurple/protocols/gg/chat.c | 34 +-
libpurple/protocols/jabber/auth_cyrus.c | 2 +-
libpurple/proxy.h | 12 +-
pidgin.spec.in | 671 ----
pidgin/plugins/Makefile.am | 4 -
pidgin/plugins/Makefile.mingw | 1 -
pidgin/plugins/perl/common/Makefile.PL.in | 4 +-
pidgin/plugins/perl/common/Pidgin.pm | 2 -
pidgin/plugins/pidginrc.c | 677 ----
po/ChangeLog | 6 +-
po/POTFILES.in | 3 -
po/af.po | 907 +++--
po/am.po | 723 ++-
po/ar.po | 897 +++--
po/as.po | 1063 ++++--
po/ast.po | 104 +-
po/az.po | 717 ++-
po/be at latin.po | 905 +++--
po/bg.po | 839 +++--
po/bn.po | 914 +++--
po/bn_IN.po | 891 +++--
po/bs.po | 863 +++--
po/ca.po | 897 +++--
po/ca at valencia.po | 873 +++--
po/cs.po | 895 +++--
po/da.po | 119 +-
po/dz.po | 918 +++--
po/el.po | 126 +-
po/en_AU.po | 864 +++--
po/en_CA.po | 674 ++-
po/en_GB.po | 2079 +++---------
po/eo.po | 831 +++--
po/es.po | 4099 +++++++++++++------------
po/et.po | 104 +-
po/eu.po | 901 +++--
po/fa.po | 104 +-
po/fi.po | 894 +++--
po/fr.po | 907 +++--
po/ga.po | 104 +-
po/gl.po | 886 +++--
po/gu.po | 862 +++--
po/he.po | 104 +-
po/hi.po | 887 +++--
po/hr.po | 685 ++-
po/hu.po | 885 +++--
po/hy.po | 654 ++-
po/id.po | 905 +++--
po/it.po | 909 +++--
po/ja.po | 883 +++--
po/ka.po | 755 ++--
po/km.po | 2433 ++++-----------
po/kn.po | 873 +++--
po/ko.po | 891 +++--
po/ku.po | 821 +++--
po/lo.po | 628 ++-
po/lt.po | 104 +-
po/mai.po | 843 +++--
po/mhr.po | 843 +++--
po/mk.po | 918 +++--
po/ml.po | 893 +++--
po/mn.po | 839 +++--
po/mr.po | 865 +++--
po/ms_MY.po | 674 ++-
po/my_MM.po | 104 +-
po/nb.po | 863 +++--
po/ne.po | 862 +++--
po/nl.po | 116 +-
po/nn.po | 104 +-
po/oc.po | 702 ++--
po/or.po | 832 +++--
po/pa.po | 104 +-
po/pl.po | 123 +-
po/ps.po | 751 ++--
po/pt.po | 113 +-
po/pt_BR.po | 964 +++--
po/ro.po | 912 +++--
po/ru.po | 119 +-
po/si.po | 721 ++--
po/sk.po | 885 +++--
po/sl.po | 104 +-
po/sq.po | 104 +-
po/sr.po | 847 +++--
po/sr at latin.po | 871 +++--
po/sv.po | 821 +++--
po/sw.po | 751 ++--
po/ta.po | 892 +++--
po/te.po | 824 +++--
po/th.po | 731 ++--
po/tr.po | 894 +++--
po/uk.po | 905 +++--
po/ur.po | 905 +++--
po/vi.po | 900 +++--
po/xh.po | 864 +++--
po/zh_CN.po | 859 +++--
po/zh_HK.po | 815 +++-
po/zh_TW.po | 815 +++-
157 files changed, 37135 insertions(+), 30506 deletions(-)
diffs (truncated from 96456 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
syntax: glob
.*.swp
clang_output_*
+pidgin-*
syntax: regexp
(.*/)?TAGS$
@@ -111,7 +112,6 @@ pidgin-.*.tar.gz
pidgin.apspec$
pidgin.desktop$
pidgin.desktop.in$
-pidgin.spec$
pidgin/.*\.html\.h$
pidgin/pidgin$
pidgin/pixmaps/emotes/default/24/theme
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -88,3 +88,4 @@ a3d157700972b48cf0a23b300261a5ab0c6e165b
4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
ad7e7fb98db3bbd7bf9ab49072fd34cd4fa25dd9 v2.10.7
5010e6877abce3bfc2a4912e6b38fed7d6d3df19 v2.10.8
+9438f4b2904d9574b9e6ffba463d354b3661139f v2.10.9
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,7 +79,7 @@ version 3.0.0 (??/??/????):
non-native plugin support.
* Doxygen has been replaced by gtk-doc for generating documentation.
-version 2.10.9:
+version 2.10.9 (2/2/2014):
XMPP:
* Fix problems logging into some servers including jabber.org and
chat.facebook.com. (#15879)
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,15 +15,13 @@ EXTRA_DIST = \
m4macros/introspection.m4 \
package_revision.h \
pidgin.apspec.in \
- pidgin.spec.in \
pidgin.desktop.in \
po/Makefile.mingw \
valgrind-suppressions
noinst_HEADERS = config.h package_revision.h
-dist-hook: pidgin.spec
- cp pidgin.spec $(distdir)
+dist-hook:
rm $(distdir)/config.h
distcheck-hook: libpurple/plugins/perl/common/Purple.pm pidgin/plugins/perl/common/Pidgin.pm
@@ -46,7 +44,6 @@ version-check:
# Ensure ChangeLogs have the correct version
head ChangeLog | grep "^version $(PACKAGE_VERSION) (.*):$$" >/dev/null
head ChangeLog.API | grep "^version $(PACKAGE_VERSION):$$" >/dev/null
- head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
# Ensure we're working from a tag...
test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i --debug`
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2631,7 +2631,6 @@ AC_CONFIG_FILES([Makefile
finch/plugins/Makefile
po/Makefile.in
pidgin.desktop.in
- pidgin.spec
])
AC_OUTPUT
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
@@ -8,9 +8,13 @@
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
<title>Finch Reference Manual</title>
- <releaseinfo>
- for finch &version;
- </releaseinfo>
+ <abstract>
+ <title>Finch &version;</title>
+ <para>
+ Finch is an ncurses frontend to libpurple, built using libgnt
+ (GLib Ncurses Toolkit).
+ </para>
+ </abstract>
</bookinfo>
<reference label="I">
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
@@ -68,11 +68,13 @@ IGNORE_HFILES=\
tests \
win32 \
backend-fs2.h \
+ dbus-define-api.h \
dbus-types.h \
+ glibcompat.h \
internal.h \
purple-client.h \
- purple-client-bindings.h \
- dbus-define-api.h
+ purple-client-bindings.h
+ valgrind.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/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
@@ -8,9 +8,14 @@
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
<title>Purple Reference Manual</title>
- <releaseinfo>
- for libpurple &version;
- </releaseinfo>
+ <abstract>
+ <title>Libpurple &version;</title>
+ <para>
+ libpurple is intended to be the core of an IM program. Pidgin is a GTK+
+ frontend to libpurple, and Finch is an ncurses frontend built using
+ libgnt (GLib Ncurses Toolkit).
+ </para>
+ </abstract>
</bookinfo>
<part label="I">
@@ -40,13 +45,13 @@
<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/glibcompat.xml" />
<xi:include href="xml/http.xml" />
<xi:include href="xml/idle.xml" />
<xi:include href="xml/imgstore.xml" />
@@ -86,7 +91,6 @@
<xi:include href="xml/theme.xml" />
<xi:include href="xml/upnp.xml" />
<xi:include href="xml/util.xml" />
- <xi:include href="xml/valgrind.xml" />
<xi:include href="xml/version.xml" />
<xi:include href="xml/whiteboard.xml" />
<xi:include href="xml/xfer.xml" />
@@ -123,10 +127,9 @@
</reference>
<reference label="c">
- <title>D-Bus APIs</title>
+ <title>D-Bus Server APIs</title>
<xi:include href="xml/dbus-bindings.xml" />
- <xi:include href="xml/dbus-maybe.xml" />
<xi:include href="xml/dbus-purple.xml" />
<xi:include href="xml/dbus-server.xml" />
<xi:include href="xml/dbus-useful.xml" />
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 \
+ gtk3compat.h \
gtkinternal.h
# Images to copy into HTML directory.
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
@@ -8,16 +8,18 @@
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
<title>Pidgin Reference Manual</title>
- <releaseinfo>
- for pidgin &version;
- </releaseinfo>
+ <abstract>
+ <title>Pidgin &version;</title>
+ <para>
+ Pidgin is a GTK+ frontend to libpurple.
+ </para>
+ </abstract>
</bookinfo>
<reference label="I">
<title>API Reference</title>
<xi:include href="xml/getopt.xml" />
- <xi:include href="xml/gtk3compat.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/libpurple/account.h b/libpurple/account.h
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -22,7 +22,7 @@
* SECTION:account
* @section_id: libpurple-account
* @short_description: <filename>account.h</filename>
- * @title: PurpleAccount object
+ * @title: Account object
*/
#ifndef _PURPLE_ACCOUNT_H_
diff --git a/libpurple/accountopt.h b/libpurple/accountopt.h
--- a/libpurple/accountopt.h
+++ b/libpurple/accountopt.h
@@ -21,8 +21,8 @@
/**
* SECTION:accountopt
* @section_id: libpurple-accountopt
+ * @short_description: <filename>accountopt.h</filename>
* @title: Account Options API
- * @short_description: <filename>accountopt.h</filename>
*/
#ifndef _PURPLE_ACCOUNTOPT_H_
diff --git a/libpurple/accounts.h b/libpurple/accounts.h
--- a/libpurple/accounts.h
+++ b/libpurple/accounts.h
@@ -21,8 +21,8 @@
/**
* SECTION:accounts
* @section_id: libpurple-accounts
+ * @short_description: <filename>accounts.h</filename>
* @title: Accounts subsystem API
- * @short_description: <filename>accounts.h</filename>
* @see_also: <link linkend="chapter-signals-account">Account signals</link>
*/
diff --git a/libpurple/blistnode.h b/libpurple/blistnode.h
--- a/libpurple/blistnode.h
+++ b/libpurple/blistnode.h
@@ -21,8 +21,8 @@
/**
* SECTION:blistnode
* @section_id: libpurple-blistnode
+ * @short_description: <filename>blistnode.h</filename>
* @title: Buddy list node and counting node types
- * @short_description: <filename>blistnode.h</filename>
*/
#ifndef _PURPLE_BLIST_NODE_H_
diff --git a/libpurple/blistnodetypes.h b/libpurple/blistnodetypes.h
--- a/libpurple/blistnodetypes.h
+++ b/libpurple/blistnodetypes.h
@@ -21,8 +21,8 @@
/**
* SECTION:blistnodetypes
* @section_id: libpurple-blistnodetypes
+ * @short_description: <filename>blistnodetypes.h</filename>
* @title: Buddy, Chat, Contact and Group node objects
- * @short_description: <filename>blistnodetypes.h</filename>
*/
#ifndef _PURPLE_BLISTNODE_TYPES_H_
diff --git a/libpurple/conversation.h b/libpurple/conversation.h
--- a/libpurple/conversation.h
+++ b/libpurple/conversation.h
@@ -1,8 +1,3 @@
-/**
- * @file conversation.h Conversation base class 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:conversation
+ * @section_id: libpurple-conversation
+ * @short_description: <filename>conversation.h</filename>
+ * @title: Conversation base class
+ */
+
#ifndef _PURPLE_CONVERSATION_H_
#define _PURPLE_CONVERSATION_H_
More information about the Commits
mailing list