Sun, 05 Apr 2015 13:45:18 -0700
Merge the release-2.x.y branch into master.
This was kind of a pain. As far as I can tell all the media changes that
happened in release-2.x.y were backported from master with one exception.
So I ignored all those changes from release-2.x.y and left the code in
master unchanged.
The exception is a0906e7a6bae from Jakub Adam, "Implement media encryption"
This still needs to happen in master. I didn't want to do it in this merge
because this merge was already kinda big and it seemed safer to do it
in a separate commit.
One other note:
$(GSTVIDEO_LIBS) was added to libfinch_la_LIBADD in finch/Makefile.am in
release-2.x.y in commit 2415067473ba. Is that correct? It seems weird
for finch to link against gstreamer video libraries since Finch has a
text UI.
<?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-gtklog"> <title>Log signals</title> <refsect1 id="gtklogs.signals" role="signal_proto"> <title role="signal_proto.title">List of signals</title> <synopsis> "<link linkend="gtklogs-log-displaying">log-displaying</link>" </synopsis> </refsect1> <refsect1 id="gtklogs.signal-details" role="signals"> <title role="signals.title">Signal details</title> <refsect2 id="gtklogs-log-displaying" role="signal"> <title>The <literal>"log-displaying"</literal> signal</title> <programlisting> void user_function (PidginLogViewer *viewer, PurpleLog *log, gpointer user_data) </programlisting> <para> Emitted when a log is being displayed. </para> <variablelist role="params"> <varlistentry> <term><parameter>viewer</parameter> :</term> <listitem><simpara>The log viewer.</simpara></listitem> </varlistentry> <varlistentry> <term><parameter>log</parameter> :</term> <listitem><simpara>The log being displayed.</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>