/soc/2013/ankitkv/gobjectification: 79721d976ad0: Merge gtkdoc-c...
Ankit Vani
a at nevitus.org
Sun Feb 2 07:44:20 EST 2014
Changeset: 79721d976ad0533ba2241335968c72052eb9e897
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-02 18:13 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/79721d976ad0
Description:
Merge gtkdoc-conversion
diffstat:
doc/reference/pidgin/Makefile.am | 1 -
doc/reference/pidgin/pidgin-docs.xml | 3 -
doc/reference/pidgin/signals_gtkimhtml.xml | 171 -----------
libpurple/account.h | 25 +-
libpurple/accountopt.h | 4 +-
libpurple/cmds.h | 31 +-
libpurple/connection.h | 8 +-
libpurple/conversation.h | 2 +-
libpurple/eventloop.h | 8 +-
libpurple/log.h | 41 +-
libpurple/prefs.h | 6 +-
libpurple/protocol.h | 7 +-
libpurple/request.h | 205 +++++++------
libpurple/signals.h | 8 +-
pidgin/gtkutils.h | 4 +-
pidgin/plugins/Makefile.am | 4 -
pidgin/plugins/convcolors.c | 435 -----------------------------
17 files changed, 183 insertions(+), 780 deletions(-)
diffs (truncated from 1432 to 300 lines):
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
@@ -77,7 +77,6 @@ content_files = version.xml \
signals_gtkaccount.xml \
signals_gtkblist.xml \
signals_gtkconv.xml \
- signals_gtkimhtml.xml \
signals_gtklog.xml
# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
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
@@ -37,8 +37,6 @@
<xi:include href="xml/gtkicon-theme-loader.xml" />
<xi:include href="xml/gtkicon-theme.xml" />
<xi:include href="xml/gtkidle.xml" />
- <xi:include href="xml/gtkimhtmltoolbar.xml" />
- <xi:include href="xml/gtkimhtml.xml" />
<xi:include href="xml/gtklog.xml" />
<xi:include href="xml/gtkmedia.xml" />
<xi:include href="xml/gtkmenutray.xml" />
@@ -80,7 +78,6 @@
<xi:include href="signals_gtkaccount.xml" />
<xi:include href="signals_gtkblist.xml" />
<xi:include href="signals_gtkconv.xml" />
- <xi:include href="signals_gtkimhtml.xml" />
<xi:include href="signals_gtklog.xml" />
</reference>
diff --git a/doc/reference/pidgin/signals_gtkimhtml.xml b/doc/reference/pidgin/signals_gtkimhtml.xml
deleted file mode 100644
--- a/doc/reference/pidgin/signals_gtkimhtml.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version='1.0' encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-]>
-<chapter id="chapter-signals-gtkimhtml">
-<title>IMHtml signals</title>
-
-<refsect1 id="gtkimhtml.signals" role="signal_proto">
-<title role="signal_proto.title">List of signals</title>
-<synopsis>
- "<link linkend="gtkimhtml-url_clicked">url_clicked</link>"
- "<link linkend="gtkimhtml-format_buttons_update">format_buttons_update</link>"
- "<link linkend="gtkimhtml-format_function_clear">format_function_clear</link>"
- "<link linkend="gtkimhtml-format_function_toggle">format_function_toggle</link>"
- "<link linkend="gtkimhtml-format_function_update">format_function_update</link>"
- "<link linkend="gtkimhtml-paste">paste</link>"
-</synopsis>
-</refsect1>
-
-<refsect1 id="gtkimhtml.signal-details" role="signals">
-<title role="signals.title">Signal details</title>
-
-<refsect2 id="gtkimhtml-url_clicked" role="signal">
- <title>The <literal>"url_clicked"</literal> signal</title>
-<programlisting>
-void user_function (GtkIMHtml *imhtml,
- char *uri,
- gpointer user_data)
-</programlisting>
- <para>
-Emitted when a link is clicked.
- </para>
- <variablelist role="params">
- <varlistentry>
- <term><parameter>imhtml</parameter> :</term>
- <listitem><simpara>The GtkIMHtml emitting the signal.</simpara></listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>url</parameter> :</term>
- <listitem><simpara>The uri.</simpara></listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>user_data</parameter> :</term>
- <listitem><simpara>user data set when the signal handler was connected.</simpara></listitem>
- </varlistentry>
- </variablelist>
-</refsect2>
-
-<refsect2 id="gtkimhtml-format_buttons_update" role="signal">
- <title>The <literal>"format_buttons_update"</literal> signal</title>
-<programlisting>
-void user_function (GtkIMHtml *imhtml,
- GtkIMHtmlButtons buttons,
- gpointer data)
-</programlisting>
- <para>
-Emitted when allowed formatting has changed.
- </para>
- <variablelist role="params">
- <varlistentry>
- <term><parameter>imhtml</parameter> :</term>
- <listitem><simpara>The GtkIMHtml emitting the signal.</simpara></listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>buttons</parameter> :</term>
- <listitem><simpara>GtkIMHtmlButtons for the GtkIMHtml.</simpara></listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>data</parameter> :</term>
- <listitem><simpara>User defined data.</simpara></listitem>
- </varlistentry>
- </variablelist>
-</refsect2>
-
-<refsect2 id="gtkimhtml-format_function_clear" role="signal">
- <title>The <literal>"format_function_clear"</literal> signal</title>
-<programlisting>
-void user_function (GtkIMHtml *imhtml,
- gpointer data)
-</programlisting>
- <para>
-Emitted when clearing the formatting for the GtkIMHtml.
- </para>
- <variablelist role="params">
- <varlistentry>
- <term><parameter>imhtml</parameter> :</term>
- <listitem><simpara>The GtkIMHtml emitting the signal.</simpara></listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>data</parameter> :</term>
- <listitem><simpara>User defined data.</simpara></listitem>
- </varlistentry>
- </variablelist>
-</refsect2>
-
-<refsect2 id="gtkimhtml-format_function_toggle" role="signal">
- <title>The <literal>"format_function_toggle"</literal> signal</title>
-<programlisting>
-void user_function (GtkIMHtml *imhtml,
- GtkIMHtmlButtons buttons,
- gpointer data)
-</programlisting>
- <para>
-Emitted when a format has been toggled.
- </para>
- <variablelist role="params">
- <varlistentry>
- <term><parameter>imhtml</parameter> :</term>
- <listitem><simpara>The GtkIMHtml emitting the signal.</simpara></listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>buttons</parameter> :</term>
- <listitem><simpara>GtkIMHtmlButtons for the GtkIMHtml.</simpara></listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>data</parameter> :</term>
- <listitem><simpara>User defined data.</simpara></listitem>
- </varlistentry>
- </variablelist>
-</refsect2>
-
-<refsect2 id="gtkimhtml-format_function_update" role="signal">
- <title>The <literal>"format_function_update"</literal> signal</title>
-<programlisting>
-void user_function (GtkIMHtml *imhtml,
- gpointer data)
-</programlisting>
- <para>
-Emitted when the cursor has moved and formatting has changed.
- </para>
- <variablelist role="params">
- <varlistentry>
- <term><parameter>imhtml</parameter> :</term>
- <listitem><simpara>The GtkIMHtml emitting the signal.</simpara></listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>data</parameter> :</term>
- <listitem><simpara>User defined data.</simpara></listitem>
- </varlistentry>
- </variablelist>
-</refsect2>
-
-<refsect2 id="gtkimhtml-paste" role="signal">
- <title>The <literal>"paste"</literal> signal</title>
-<programlisting>
-void user_function (GtkIMHtml *imhtml,
- char *format,
- gpointer user_data)
-</programlisting>
- <para>
-Emitted when paste from the clipboard is requested.
- </para>
- <variablelist role="params">
- <varlistentry>
- <term><parameter>imhtml</parameter> :</term>
- <listitem><simpara>The GtkIMHtml emitting the signal.</simpara></listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>format</parameter> :</term>
- <listitem><simpara>If 'text', then the formatting of the clipboard content will be removed before pasting. If empty or 'html', then the formatting will not be removed. Any other value for this parameter is ignored and nothing is pasted.</simpara></listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>user_data</parameter> :</term>
- <listitem><simpara>user data set when the signal handler was connected.</simpara></listitem>
- </varlistentry>
- </variablelist>
-</refsect2>
-
-</refsect1>
-
-</chapter>
diff --git a/libpurple/account.h b/libpurple/account.h
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -452,12 +452,13 @@ void purple_account_set_status_types(Pur
/**
* @account: The account.
* @status_id: The ID of the status.
- * @active: Whether @a status_id is to be activated (<tt>TRUE</tt>) or
- * deactivated (<tt>FALSE</tt>).
- * @...: A NULL-terminated list of pairs of <tt>const char *</tt>
- * attribute name followed by <tt>const char *</tt> attribute value
- * for the status. (For example, one pair might be
- * <tt>"message"</tt> followed by <tt>"hello, talk to me!"</tt>.)
+ * @active: Whether @a status_id is to be activated (%TRUE) or
+ * deactivated (%FALSE).
+ * @...: 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
+ * <literal>"hello, talk to me!"</literal>.)
*
* Variadic version of purple_account_set_status_list().
*/
@@ -469,12 +470,12 @@ void purple_account_set_status(PurpleAcc
* purple_account_set_status_list:
* @account: The account.
* @status_id: The ID of the status.
- * @active: Whether @a status_id is to be activated (<tt>TRUE</tt>) or
- * deactivated (<tt>FALSE</tt>).
- * @attrs: A list of <tt>const char *</tt> attribute names followed by
- * <tt>const char *</tt> attribute values for the status.
- * (For example, one pair might be <tt>"message"</tt> followed
- * by <tt>"hello, talk to me!"</tt>.)
+ * @active: Whether @a status_id is to be activated (%TRUE) or
+ * deactivated (%FALSE).
+ * @attrs: A list of <type>const char *</type> attribute names followed by
+ * <type>const char *</type> attribute values for the status.
+ * (For example, one pair might be <literal>"message"</literal>
+ * followed by <literal>"hello, talk to me!"</literal>.)
*
* Activates or deactivates a status. All changes to the statuses of
* an account go through this function or purple_account_set_status().
diff --git a/libpurple/accountopt.h b/libpurple/accountopt.h
--- a/libpurple/accountopt.h
+++ b/libpurple/accountopt.h
@@ -126,7 +126,7 @@ PurpleAccountOption *purple_account_opti
* strings inside will be freed automatically.
*
* The list is a list of #PurpleKeyValuePair items. The key is the label that
- * should be displayed to the user, and the <tt>(const char *)</tt> value is
+ * should be displayed to the user, and the <type>(const char *)</type> value is
* the internal ID that should be passed to purple_account_set_string() to
* choose that value.
*
@@ -328,7 +328,7 @@ const GSList * purple_account_option_str
* Returns the list values for an account option.
*
* Returns: (transfer none): A list of #PurpleKeyValuePair, mapping the human-readable
- * description of the value to the <tt>(const char *)</tt> that
+ * description of the value to the <type>(const char *)</type> that
* should be passed to purple_account_set_string() to set the
* option.
*/
diff --git a/libpurple/cmds.h b/libpurple/cmds.h
--- a/libpurple/cmds.h
+++ b/libpurple/cmds.h
@@ -140,11 +140,14 @@ G_BEGIN_DECLS
* This string should contain no whitespace, and use a single
* character for each argument. The recognized characters are:
* <ul>
- * <li><tt>'w'</tt>: Matches a single word.</li>
- * <li><tt>'W'</tt>: Matches a single word, with formatting.</li>
- * <li><tt>'s'</tt>: Matches the rest of the arguments after this
- * point, as a single string.</li>
- * <li><tt>'S'</tt>: Same as <tt>'s'</tt> but with formatting.</li>
+ * <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
@@ -155,14 +158,14 @@ G_BEGIN_DECLS
* and usually the first command will stop any others from being
* called.
* @f: Flags specifying various options about this command, combined with
- * <tt>|</tt> (bitwise OR). You need to at least pass one of
+ * <literal>|</literal> (bitwise OR). You need to at least pass one of
* #PURPLE_CMD_FLAG_IM or #PURPLE_CMD_FLAG_CHAT (you may pass both) in
More information about the Commits
mailing list