Hello community, here is the log from the commit of package gupnp for openSUSE:Factory checked in at Fri Aug 12 09:43:47 CEST 2011. -------- --- GNOME/gupnp/gupnp.changes 2011-07-07 14:00:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/gupnp/gupnp.changes 2011-08-05 20:33:03.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Aug 5 20:29:23 CEST 2011 - dimstar@opensuse.org + +- Update to version 0.17.2: + + Drop main-context property + + Fix a small leak from the default-language property. + + Refactor and clean-up internals of GUPnPContextManager. +- Do not package ChangeLog: It's an empty file. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gupnp-0.17.1.tar.bz2 New: ---- gupnp-0.17.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gupnp.spec ++++++ --- /var/tmp/diff_new_pack.clSIWx/_old 2011-08-12 09:42:51.000000000 +0200 +++ /var/tmp/diff_new_pack.clSIWx/_new 2011-08-12 09:42:51.000000000 +0200 @@ -18,7 +18,7 @@ Name: gupnp -Version: 0.17.1 +Version: 0.17.2 Release: 1 Summary: Implementation of the UPnP specification License: LGPL v2 or later @@ -26,8 +26,8 @@ Url: http://www.gupnp.org/ Source: http://download.gnome.org/sources/gupnp/0.17/%{name}-%{version}.tar.bz2 BuildRequires: gobject-introspection-devel -BuildRequires: libsoup-devel -BuildRequires: libgssdp-devel +BuildRequires: libsoup-devel >= 2.28.2 +BuildRequires: libgssdp-devel >= 0.11.2 BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -90,7 +90,7 @@ %files -n libgupnp-1_0-4 %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS COPYING NEWS README %{_libdir}/*.so.* %{_libdir}/girepository-1.0/GUPnP-1.0.typelib ++++++ gupnp-0.17.1.tar.bz2 -> gupnp-0.17.2.tar.bz2 ++++++ ++++ 1735 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/NEWS new/gupnp-0.17.2/NEWS --- old/gupnp-0.17.1/NEWS 2011-07-07 11:17:45.000000000 +0200 +++ new/gupnp-0.17.2/NEWS 2011-08-04 22:43:51.000000000 +0200 @@ -1,3 +1,18 @@ +0.17.2 +====== + +Changes since 0.17.1: + +- Drop main-context property +- Fix a small leak from the default-language property. +- Refactor and clean-up internals of GUPnPContextManager. + +Dependency-related changes: + - Require gssdp >= 0.11.2. + +All contributors: +Jens Georg <mail@jensge.org> + 0.17.1 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/configure.ac new/gupnp-0.17.2/configure.ac --- old/gupnp-0.17.1/configure.ac 2011-07-07 11:02:53.000000000 +0200 +++ new/gupnp-0.17.2/configure.ac 2011-08-04 22:43:57.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) AC_INIT([gupnp], - [0.17.1], - [http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp], + [0.17.2], + [http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp&component=gupnp], [gupnp], [http://www.gupnp.org/]) @@ -46,7 +46,7 @@ PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.24.0 \ gio-2.0 \ gmodule-2.0 \ - gssdp-1.0 >= 0.11.0 \ + gssdp-1.0 >= 0.11.2 \ libsoup-2.4 >= 2.28.2 \ libxml-2.0 \ $UUID) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/GUPnPContext.html new/gupnp-0.17.2/doc/html/GUPnPContext.html --- old/gupnp-0.17.1/doc/html/GUPnPContext.html 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/GUPnPContext.html 2011-08-04 22:51:01.000000000 +0200 @@ -50,8 +50,8 @@ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>); const <span class="returnvalue">char</span> * <a class="link" href="GUPnPContext.html#gupnp-context-get-host-ip" title="gupnp_context_get_host_ip ()">gupnp_context_get_host_ip</a> (<em class="parameter"><code><a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="GUPnPContext.html#gupnp-context-get-port" title="gupnp_context_get_port ()">gupnp_context_get_port</a> (<em class="parameter"><code><a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context</code></em>); -<a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupServer.html"><span class="returnvalue">SoupServer</span></a> * <a class="link" href="GUPnPContext.html#gupnp-context-get-server" title="gupnp_context_get_server ()">gupnp_context_get_server</a> (<em class="parameter"><code><a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context</code></em>); -<a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupSession.html"><span class="returnvalue">SoupSession</span></a> * <a class="link" href="GUPnPContext.html#gupnp-context-get-session" title="gupnp_context_get_session ()">gupnp_context_get_session</a> (<em class="parameter"><code><a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context</code></em>); +<span class="returnvalue">SoupServer</span> * <a class="link" href="GUPnPContext.html#gupnp-context-get-server" title="gupnp_context_get_server ()">gupnp_context_get_server</a> (<em class="parameter"><code><a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context</code></em>); +<span class="returnvalue">SoupSession</span> * <a class="link" href="GUPnPContext.html#gupnp-context-get-session" title="gupnp_context_get_session ()">gupnp_context_get_session</a> (<em class="parameter"><code><a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context</code></em>); <span class="returnvalue">void</span> <a class="link" href="GUPnPContext.html#gupnp-context-set-subscription-timeout" title="gupnp_context_set_subscription_timeout ()">gupnp_context_set_subscription_timeout</a> (<em class="parameter"><code><a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> timeout</code></em>); @@ -75,7 +75,7 @@ <a name="GUPnPContext.object-hierarchy"></a><h2>Object Hierarchy</h2> <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> - +----<a href="http://developer.gnome.org/devel/gssdp/unstable/GSSDPClient.html">GSSDPClient</a> + +----<a href="http://developer.gnome.org/gssdp/unstable/GSSDPClient.html">GSSDPClient</a> +----GUPnPContext </pre> </div> @@ -90,8 +90,8 @@ <pre class="synopsis"> "<a class="link" href="GUPnPContext.html#GUPnPContext--default-language" title='The "default-language" property'>default-language</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct "<a class="link" href="GUPnPContext.html#GUPnPContext--port" title='The "port" property'>port</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct Only - "<a class="link" href="GUPnPContext.html#GUPnPContext--server" title='The "server" property'>server</a>" <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupServer.html"><span class="type">SoupServer</span></a>* : Read - "<a class="link" href="GUPnPContext.html#GUPnPContext--session" title='The "session" property'>session</a>" <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupSession.html"><span class="type">SoupSession</span></a>* : Read + "<a class="link" href="GUPnPContext.html#GUPnPContext--server" title='The "server" property'>server</a>" <span class="type">SoupServer</span>* : Read + "<a class="link" href="GUPnPContext.html#GUPnPContext--session" title='The "session" property'>session</a>" <span class="type">SoupSession</span>* : Read "<a class="link" href="GUPnPContext.html#GUPnPContext--subscription-timeout" title='The "subscription-timeout" property'>subscription-timeout</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct Only </pre> </div> @@ -132,7 +132,8 @@ <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>main_context</code></em> :</span></p></td> -<td>A <a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to use the default one</td> +<td>Deprecated: 0.17.2: Always set to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. If you want to use +a different context, use <a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-context-push-thread-default"><code class="function">g_main_context_push_thread_default()</code></a>.</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>interface</code></em> :</span></p></td> @@ -161,8 +162,8 @@ <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;"> <h3 class="title">Warning</h3> <p><code class="literal">gupnp_context_get_host_ip</code> has been deprecated since version 0.12.7 and should not be used in newly-written code. The "host-ip" property has moved to the base class -<a href="http://developer.gnome.org/devel/gssdp/unstable/GSSDPClient.html"><span class="type">GSSDPClient</span></a> so newer applications should use -<a href="http://developer.gnome.org/devel/gssdp/unstable/GSSDPClient.html#gssdp-client-get-host-ip"><span class="type">gssdp_client_get_host_ip</span></a> instead.</p> +<a href="http://developer.gnome.org/gssdp/unstable/GSSDPClient.html"><span class="type">GSSDPClient</span></a> so newer applications should use +<a href="http://developer.gnome.org/gssdp/unstable/GSSDPClient.html#gssdp-client-get-host-ip"><span class="type">gssdp_client_get_host_ip</span></a> instead.</p> </div> <p> Get the IP address we advertise ourselves as using. @@ -207,9 +208,9 @@ <hr> <div class="refsect2"> <a name="gupnp-context-get-server"></a><h3>gupnp_context_get_server ()</h3> -<pre class="programlisting"><a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupServer.html"><span class="returnvalue">SoupServer</span></a> * gupnp_context_get_server (<em class="parameter"><code><a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context</code></em>);</pre> +<pre class="programlisting"><span class="returnvalue">SoupServer</span> * gupnp_context_get_server (<em class="parameter"><code><a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context</code></em>);</pre> <p> -Get the <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupServer.html"><span class="type">SoupServer</span></a> HTTP server that GUPnP is using. +Get the <span class="type">SoupServer</span> HTTP server that GUPnP is using. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -221,7 +222,7 @@ </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>The <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupServer.html"><span class="type">SoupServer</span></a> used by GUPnP. Do not unref this when finished. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> +<td>The <span class="type">SoupServer</span> used by GUPnP. Do not unref this when finished. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> </td> </tr> </tbody> @@ -230,9 +231,9 @@ <hr> <div class="refsect2"> <a name="gupnp-context-get-session"></a><h3>gupnp_context_get_session ()</h3> -<pre class="programlisting"><a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupSession.html"><span class="returnvalue">SoupSession</span></a> * gupnp_context_get_session (<em class="parameter"><code><a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context</code></em>);</pre> +<pre class="programlisting"><span class="returnvalue">SoupSession</span> * gupnp_context_get_session (<em class="parameter"><code><a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context</code></em>);</pre> <p> -Get the <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupSession.html"><span class="type">SoupSession</span></a> object that GUPnP is using. +Get the <span class="type">SoupSession</span> object that GUPnP is using. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -244,7 +245,7 @@ </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>The <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupSession.html"><span class="type">SoupSession</span></a> used by GUPnP. Do not unref +<td>The <span class="type">SoupSession</span> used by GUPnP. Do not unref this when finished. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> </td> </tr> @@ -465,17 +466,17 @@ <hr> <div class="refsect2"> <a name="GUPnPContext--server"></a><h3>The <code class="literal">"server"</code> property</h3> -<pre class="programlisting"> "server" <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupServer.html"><span class="type">SoupServer</span></a>* : Read</pre> +<pre class="programlisting"> "server" <span class="type">SoupServer</span>* : Read</pre> <p> -The <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupServer.html"><span class="type">SoupServer</span></a> HTTP server used by GUPnP. +The <span class="type">SoupServer</span> HTTP server used by GUPnP. </p> </div> <hr> <div class="refsect2"> <a name="GUPnPContext--session"></a><h3>The <code class="literal">"session"</code> property</h3> -<pre class="programlisting"> "session" <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupSession.html"><span class="type">SoupSession</span></a>* : Read</pre> +<pre class="programlisting"> "session" <span class="type">SoupSession</span>* : Read</pre> <p> -The <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupSession.html"><span class="type">SoupSession</span></a> object used by GUPnP. +The <span class="type">SoupSession</span> object used by GUPnP. </p> </div> <hr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/GUPnPContextManager.html new/gupnp-0.17.2/doc/html/GUPnPContextManager.html --- old/gupnp-0.17.1/doc/html/GUPnPContextManager.html 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/GUPnPContextManager.html 2011-08-04 22:51:01.000000000 +0200 @@ -64,7 +64,6 @@ <div class="refsect1"> <a name="GUPnPContextManager.properties"></a><h2>Properties</h2> <pre class="synopsis"> - "<a class="link" href="GUPnPContextManager.html#GUPnPContextManager--context-manager" title='The "context-manager" property'>context-manager</a>" <a class="link" href="GUPnPContextManager.html" title="GUPnPContextManager"><span class="type">GUPnPContextManager</span></a>* : Write / Construct Only "<a class="link" href="GUPnPContextManager.html#GUPnPContextManager--main-context" title='The "main-context" property'>main-context</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> : Read / Write / Construct Only "<a class="link" href="GUPnPContextManager.html#GUPnPContextManager--port" title='The "port" property'>port</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct Only </pre> @@ -73,7 +72,7 @@ <a name="GUPnPContextManager.signals"></a><h2>Signals</h2> <pre class="synopsis"> "<a class="link" href="GUPnPContextManager.html#GUPnPContextManager-context-available" title='The "context-available" signal'>context-available</a>" : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a> - "<a class="link" href="GUPnPContextManager.html#GUPnPContextManager-context-unavailable" title='The "context-unavailable" signal'>context-unavailable</a>" : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a> + "<a class="link" href="GUPnPContextManager.html#GUPnPContextManager-context-unavailable" title='The "context-unavailable" signal'>context-unavailable</a>" : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a> </pre> </div> <div class="refsect1"> @@ -99,15 +98,24 @@ <a name="gupnp-context-manager-new"></a><h3>gupnp_context_manager_new ()</h3> <pre class="programlisting"><a class="link" href="GUPnPContextManager.html" title="GUPnPContextManager"><span class="returnvalue">GUPnPContextManager</span></a> * gupnp_context_manager_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> *main_context</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> port</code></em>);</pre> +<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;"> +<h3 class="title">Warning</h3> +<p><code class="literal">gupnp_context_manager_new</code> has been deprecated since version 0.17.2 and should not be used in newly-written code. Use <code class="function">gupnp_context_manager_create()</code>.</p> +</div> <p> -Create a new <a class="link" href="GUPnPContextManager.html" title="GUPnPContextManager"><span class="type">GUPnPContextManager</span></a>. +Factory-method to create a new <a class="link" href="GUPnPContextManager.html" title="GUPnPContextManager"><span class="type">GUPnPContextManager</span></a>. The final type of the +<a class="link" href="GUPnPContextManager.html" title="GUPnPContextManager"><span class="type">GUPnPContextManager</span></a> depends on the compile-time selection or - in case of +NetworkManager - on its availability during runtime. If it is not available, +the implementation falls back to the basic Unix context manager instead. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>main_context</code></em> :</span></p></td> -<td>GMainContext to pass to created GUPnPContext objects. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span> +<td>Deprecated: 0.17.2: <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. If you want to use +a different main context use +<a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-context-push-thread-default"><code class="function">g_main_context_push_thread_default()</code></a> instead. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span> </td> </tr> <tr> @@ -116,7 +124,8 @@ </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>A new <a class="link" href="GUPnPContextManager.html" title="GUPnPContextManager"><span class="type">GUPnPContextManager</span></a> object.</td> +<td>A new <a class="link" href="GUPnPContextManager.html" title="GUPnPContextManager"><span class="type">GUPnPContextManager</span></a> object. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> +</td> </tr> </tbody> </table></div> @@ -181,16 +190,6 @@ <div class="refsect1"> <a name="GUPnPContextManager.property-details"></a><h2>Property Details</h2> <div class="refsect2"> -<a name="GUPnPContextManager--context-manager"></a><h3>The <code class="literal">"context-manager"</code> property</h3> -<pre class="programlisting"> "context-manager" <a class="link" href="GUPnPContextManager.html" title="GUPnPContextManager"><span class="type">GUPnPContextManager</span></a>* : Write / Construct Only</pre> -<p> -The actual GUPnPContextManager implementation used. This is an -internal property and therefore Application developer should just -ignore it. -</p> -</div> -<hr> -<div class="refsect2"> <a name="GUPnPContextManager--main-context"></a><h3>The <code class="literal">"main-context"</code> property</h3> <pre class="programlisting"> "main-context" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> : Read / Write / Construct Only</pre> <p>GMainContext to pass to created GUPnPContext objects.</p> @@ -240,7 +239,7 @@ <a name="GUPnPContextManager-context-unavailable"></a><h3>The <code class="literal">"context-unavailable"</code> signal</h3> <pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="GUPnPContextManager.html" title="GUPnPContextManager"><span class="type">GUPnPContextManager</span></a> *context_manager, <a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a> *context, - <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a></pre> + <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre> <p> Signals the unavailability of a <a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="type">GUPnPContext</span></a>. </p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/GUPnPControlPoint.html new/gupnp-0.17.2/doc/html/GUPnPControlPoint.html --- old/gupnp-0.17.1/doc/html/GUPnPControlPoint.html 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/GUPnPControlPoint.html 2011-08-04 22:51:02.000000000 +0200 @@ -62,7 +62,7 @@ <a name="GUPnPControlPoint.object-hierarchy"></a><h2>Object Hierarchy</h2> <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> - +----<a href="http://developer.gnome.org/devel/gssdp/unstable/GSSDPResourceBrowser.html">GSSDPResourceBrowser</a> + +----<a href="http://developer.gnome.org/gssdp/unstable/GSSDPResourceBrowser.html">GSSDPResourceBrowser</a> +----GUPnPControlPoint </pre> </div> @@ -85,7 +85,7 @@ <a name="GUPnPControlPoint.description"></a><h2>Description</h2> <p> <a class="link" href="GUPnPControlPoint.html" title="GUPnPControlPoint"><span class="type">GUPnPControlPoint</span></a> handles device and service discovery. After creating -a control point and activating it using <a href="http://developer.gnome.org/devel/gssdp/unstable/GSSDPResourceBrowser.html#gssdp-resource-browser-set-active"><code class="function">gssdp_resource_browser_set_active()</code></a>, +a control point and activating it using <a href="http://developer.gnome.org/gssdp/unstable/GSSDPResourceBrowser.html#gssdp-resource-browser-set-active"><code class="function">gssdp_resource_browser_set_active()</code></a>, the ::device-proxy-available, ::service-proxy-available, ::device-proxy-unavailable and ::service-proxy-unavailable signals will be emitted whenever the availability of a device or service matching diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/GUPnPDeviceInfo.html new/gupnp-0.17.2/doc/html/GUPnPDeviceInfo.html --- old/gupnp-0.17.1/doc/html/GUPnPDeviceInfo.html 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/GUPnPDeviceInfo.html 2011-08-04 22:51:02.000000000 +0200 @@ -46,7 +46,7 @@ (<em class="parameter"><code><a class="link" href="GUPnPDeviceInfo.html" title="GUPnPDeviceInfo"><span class="type">GUPnPDeviceInfo</span></a> *device_info</code></em>); <a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="returnvalue">GUPnPContext</span></a> * <a class="link" href="GUPnPDeviceInfo.html#gupnp-device-info-get-context" title="gupnp_device_info_get_context ()">gupnp_device_info_get_context</a> (<em class="parameter"><code><a class="link" href="GUPnPDeviceInfo.html" title="GUPnPDeviceInfo"><span class="type">GUPnPDeviceInfo</span></a> *info</code></em>); const <span class="returnvalue">char</span> * <a class="link" href="GUPnPDeviceInfo.html#gupnp-device-info-get-location" title="gupnp_device_info_get_location ()">gupnp_device_info_get_location</a> (<em class="parameter"><code><a class="link" href="GUPnPDeviceInfo.html" title="GUPnPDeviceInfo"><span class="type">GUPnPDeviceInfo</span></a> *info</code></em>); -const <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupURI.html"><span class="returnvalue">SoupURI</span></a> * <a class="link" href="GUPnPDeviceInfo.html#gupnp-device-info-get-url-base" title="gupnp_device_info_get_url_base ()">gupnp_device_info_get_url_base</a> (<em class="parameter"><code><a class="link" href="GUPnPDeviceInfo.html" title="GUPnPDeviceInfo"><span class="type">GUPnPDeviceInfo</span></a> *info</code></em>); +const <span class="returnvalue">SoupURI</span> * <a class="link" href="GUPnPDeviceInfo.html#gupnp-device-info-get-url-base" title="gupnp_device_info_get_url_base ()">gupnp_device_info_get_url_base</a> (<em class="parameter"><code><a class="link" href="GUPnPDeviceInfo.html" title="GUPnPDeviceInfo"><span class="type">GUPnPDeviceInfo</span></a> *info</code></em>); const <span class="returnvalue">char</span> * <a class="link" href="GUPnPDeviceInfo.html#gupnp-device-info-get-udn" title="gupnp_device_info_get_udn ()">gupnp_device_info_get_udn</a> (<em class="parameter"><code><a class="link" href="GUPnPDeviceInfo.html" title="GUPnPDeviceInfo"><span class="type">GUPnPDeviceInfo</span></a> *info</code></em>); const <span class="returnvalue">char</span> * <a class="link" href="GUPnPDeviceInfo.html#gupnp-device-info-get-device-type" title="gupnp_device_info_get_device_type ()">gupnp_device_info_get_device_type</a> (<em class="parameter"><code><a class="link" href="GUPnPDeviceInfo.html" title="GUPnPDeviceInfo"><span class="type">GUPnPDeviceInfo</span></a> *info</code></em>); <span class="returnvalue">char</span> * <a class="link" href="GUPnPDeviceInfo.html#gupnp-device-info-get-friendly-name" title="gupnp_device_info_get_friendly_name ()">gupnp_device_info_get_friendly_name</a> (<em class="parameter"><code><a class="link" href="GUPnPDeviceInfo.html" title="GUPnPDeviceInfo"><span class="type">GUPnPDeviceInfo</span></a> *info</code></em>); @@ -199,7 +199,7 @@ <hr> <div class="refsect2"> <a name="gupnp-device-info-get-url-base"></a><h3>gupnp_device_info_get_url_base ()</h3> -<pre class="programlisting">const <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupURI.html"><span class="returnvalue">SoupURI</span></a> * gupnp_device_info_get_url_base (<em class="parameter"><code><a class="link" href="GUPnPDeviceInfo.html" title="GUPnPDeviceInfo"><span class="type">GUPnPDeviceInfo</span></a> *info</code></em>);</pre> +<pre class="programlisting">const <span class="returnvalue">SoupURI</span> * gupnp_device_info_get_url_base (<em class="parameter"><code><a class="link" href="GUPnPDeviceInfo.html" title="GUPnPDeviceInfo"><span class="type">GUPnPDeviceInfo</span></a> *info</code></em>);</pre> <p> Get the URL base of this device. </p> @@ -213,7 +213,7 @@ </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>A <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupURI.html"><span class="type">SoupURI</span></a>.</td> +<td>A <span class="type">SoupURI</span>.</td> </tr> </tbody> </table></div> @@ -882,7 +882,7 @@ <a name="GUPnPDeviceInfo--url-base"></a><h3>The <code class="literal">"url-base"</code> property</h3> <pre class="programlisting"> "url-base" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> : Read / Write / Construct Only</pre> <p> -The URL base (<a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupURI.html"><span class="type">SoupURI</span></a>). +The URL base (<span class="type">SoupURI</span>). </p> </div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/GUPnPService.html new/gupnp-0.17.2/doc/html/GUPnPService.html --- old/gupnp-0.17.1/doc/html/GUPnPService.html 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/GUPnPService.html 2011-08-04 22:51:01.000000000 +0200 @@ -74,7 +74,7 @@ <span class="returnvalue">void</span> <a class="link" href="GUPnPService.html#gupnp-service-action-return-error" title="gupnp_service_action_return_error ()">gupnp_service_action_return_error</a> (<em class="parameter"><code><a class="link" href="GUPnPService.html#GUPnPServiceAction"><span class="type">GUPnPServiceAction</span></a> *action</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> error_code</code></em>, <em class="parameter"><code>const <span class="type">char</span> *error_description</code></em>); -<a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupMessage.html"><span class="returnvalue">SoupMessage</span></a> * <a class="link" href="GUPnPService.html#gupnp-service-action-get-message" title="gupnp_service_action_get_message ()">gupnp_service_action_get_message</a> (<em class="parameter"><code><a class="link" href="GUPnPService.html#GUPnPServiceAction"><span class="type">GUPnPServiceAction</span></a> *action</code></em>); +<span class="returnvalue">SoupMessage</span> * <a class="link" href="GUPnPService.html#gupnp-service-action-get-message" title="gupnp_service_action_get_message ()">gupnp_service_action_get_message</a> (<em class="parameter"><code><a class="link" href="GUPnPService.html#GUPnPServiceAction"><span class="type">GUPnPServiceAction</span></a> *action</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="GUPnPService.html#gupnp-service-action-get-argument-count" title="gupnp_service_action_get_argument_count ()">gupnp_service_action_get_argument_count</a> (<em class="parameter"><code><a class="link" href="GUPnPService.html#GUPnPServiceAction"><span class="type">GUPnPServiceAction</span></a> *action</code></em>); <span class="returnvalue">void</span> <a class="link" href="GUPnPService.html#gupnp-service-notify" title="gupnp_service_notify ()">gupnp_service_notify</a> (<em class="parameter"><code><a class="link" href="GUPnPService.html" title="GUPnPService"><span class="type">GUPnPService</span></a> *service</code></em>, @@ -500,9 +500,9 @@ <hr> <div class="refsect2"> <a name="gupnp-service-action-get-message"></a><h3>gupnp_service_action_get_message ()</h3> -<pre class="programlisting"><a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupMessage.html"><span class="returnvalue">SoupMessage</span></a> * gupnp_service_action_get_message (<em class="parameter"><code><a class="link" href="GUPnPService.html#GUPnPServiceAction"><span class="type">GUPnPServiceAction</span></a> *action</code></em>);</pre> +<pre class="programlisting"><span class="returnvalue">SoupMessage</span> * gupnp_service_action_get_message (<em class="parameter"><code><a class="link" href="GUPnPService.html#GUPnPServiceAction"><span class="type">GUPnPServiceAction</span></a> *action</code></em>);</pre> <p> -Get the <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupMessage.html"><span class="type">SoupMessage</span></a> associated with <em class="parameter"><code>action</code></em>. Mainly intended for +Get the <span class="type">SoupMessage</span> associated with <em class="parameter"><code>action</code></em>. Mainly intended for applications to be able to read HTTP headers received from clients. </p> <div class="variablelist"><table border="0"> @@ -516,7 +516,7 @@ <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> -<a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupMessage.html"><span class="type">SoupMessage</span></a> associated with <em class="parameter"><code>action</code></em>. Unref +<span class="type">SoupMessage</span> associated with <em class="parameter"><code>action</code></em>. Unref after using it. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> </tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/GUPnPServiceInfo.html new/gupnp-0.17.2/doc/html/GUPnPServiceInfo.html --- old/gupnp-0.17.1/doc/html/GUPnPServiceInfo.html 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/GUPnPServiceInfo.html 2011-08-04 22:51:02.000000000 +0200 @@ -49,7 +49,7 @@ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>); <a class="link" href="GUPnPContext.html" title="GUPnPContext"><span class="returnvalue">GUPnPContext</span></a> * <a class="link" href="GUPnPServiceInfo.html#gupnp-service-info-get-context" title="gupnp_service_info_get_context ()">gupnp_service_info_get_context</a> (<em class="parameter"><code><a class="link" href="GUPnPServiceInfo.html" title="GUPnPServiceInfo"><span class="type">GUPnPServiceInfo</span></a> *info</code></em>); const <span class="returnvalue">char</span> * <a class="link" href="GUPnPServiceInfo.html#gupnp-service-info-get-location" title="gupnp_service_info_get_location ()">gupnp_service_info_get_location</a> (<em class="parameter"><code><a class="link" href="GUPnPServiceInfo.html" title="GUPnPServiceInfo"><span class="type">GUPnPServiceInfo</span></a> *info</code></em>); -const <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupURI.html"><span class="returnvalue">SoupURI</span></a> * <a class="link" href="GUPnPServiceInfo.html#gupnp-service-info-get-url-base" title="gupnp_service_info_get_url_base ()">gupnp_service_info_get_url_base</a> (<em class="parameter"><code><a class="link" href="GUPnPServiceInfo.html" title="GUPnPServiceInfo"><span class="type">GUPnPServiceInfo</span></a> *info</code></em>); +const <span class="returnvalue">SoupURI</span> * <a class="link" href="GUPnPServiceInfo.html#gupnp-service-info-get-url-base" title="gupnp_service_info_get_url_base ()">gupnp_service_info_get_url_base</a> (<em class="parameter"><code><a class="link" href="GUPnPServiceInfo.html" title="GUPnPServiceInfo"><span class="type">GUPnPServiceInfo</span></a> *info</code></em>); const <span class="returnvalue">char</span> * <a class="link" href="GUPnPServiceInfo.html#gupnp-service-info-get-udn" title="gupnp_service_info_get_udn ()">gupnp_service_info_get_udn</a> (<em class="parameter"><code><a class="link" href="GUPnPServiceInfo.html" title="GUPnPServiceInfo"><span class="type">GUPnPServiceInfo</span></a> *info</code></em>); const <span class="returnvalue">char</span> * <a class="link" href="GUPnPServiceInfo.html#gupnp-service-info-get-service-type" title="gupnp_service_info_get_service_type ()">gupnp_service_info_get_service_type</a> (<em class="parameter"><code><a class="link" href="GUPnPServiceInfo.html" title="GUPnPServiceInfo"><span class="type">GUPnPServiceInfo</span></a> *info</code></em>); <span class="returnvalue">char</span> * <a class="link" href="GUPnPServiceInfo.html#gupnp-service-info-get-id" title="gupnp_service_info_get_id ()">gupnp_service_info_get_id</a> (<em class="parameter"><code><a class="link" href="GUPnPServiceInfo.html" title="GUPnPServiceInfo"><span class="type">GUPnPServiceInfo</span></a> *info</code></em>); @@ -185,7 +185,7 @@ <hr> <div class="refsect2"> <a name="gupnp-service-info-get-url-base"></a><h3>gupnp_service_info_get_url_base ()</h3> -<pre class="programlisting">const <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupURI.html"><span class="returnvalue">SoupURI</span></a> * gupnp_service_info_get_url_base (<em class="parameter"><code><a class="link" href="GUPnPServiceInfo.html" title="GUPnPServiceInfo"><span class="type">GUPnPServiceInfo</span></a> *info</code></em>);</pre> +<pre class="programlisting">const <span class="returnvalue">SoupURI</span> * gupnp_service_info_get_url_base (<em class="parameter"><code><a class="link" href="GUPnPServiceInfo.html" title="GUPnPServiceInfo"><span class="type">GUPnPServiceInfo</span></a> *info</code></em>);</pre> <p> Get the URL base of this service. </p> @@ -199,7 +199,7 @@ </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>A constant <a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupURI.html"><span class="type">SoupURI</span></a>.</td> +<td>A constant <span class="type">SoupURI</span>.</td> </tr> </tbody> </table></div> @@ -465,7 +465,7 @@ <a name="GUPnPServiceInfo--url-base"></a><h3>The <code class="literal">"url-base"</code> property</h3> <pre class="programlisting"> "url-base" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> : Read / Write / Construct Only</pre> <p> -The URL base (<a href="/opt/gnome2/share/gtk-doc/html/libsoup-2.4/SoupURI.html"><span class="type">SoupURI</span></a>). +The URL base (<span class="type">SoupURI</span>). </p> </div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/client-tutorial.html new/gupnp-0.17.2/doc/html/client-tutorial.html --- old/gupnp-0.17.1/doc/html/client-tutorial.html 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/client-tutorial.html 2011-08-04 22:51:01.000000000 +0200 @@ -24,7 +24,7 @@ <a name="client-tutorial"></a>Writing a UPnP Client</h2></div></div></div> <div class="simplesect"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id441920"></a>Introduction</h2></div></div></div> +<a name="id438097"></a>Introduction</h2></div></div></div> <p> This chapter explains how to write an application which fetches the external IP address from an UPnP-compliant modem. To do this a @@ -41,7 +41,7 @@ </div> <div class="simplesect"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id409778"></a>Finding Services</h2></div></div></div> +<a name="id405955"></a>Finding Services</h2></div></div></div> <p> First, we initialize GUPnP and create a control point targeting the service type. Then we connect a signal handler so that we are notified @@ -103,7 +103,7 @@ </div> <div class="simplesect"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id409915"></a>Invoking Actions</h2></div></div></div> +<a name="id406092"></a>Invoking Actions</h2></div></div></div> <p> Now we have an application which searches for the service we specified and calls <code class="function">service_proxy_available_cb</code> for each one it @@ -153,7 +153,7 @@ </div> <div class="simplesect"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id441527"></a>Subscribing to state variable change notifications</h2></div></div></div> +<a name="id437704"></a>Subscribing to state variable change notifications</h2></div></div></div> <p> It is possible to get change notifications for the service state variables that have attribute <code class="literal">sendEvents="yes"</code>. We'll demonstrate @@ -188,7 +188,7 @@ </div> <div class="simplesect"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id442260"></a>Generating Wrappers</h2></div></div></div> +<a name="id438437"></a>Generating Wrappers</h2></div></div></div> <p> Using gupnp_service_proxy_send_action() and gupnp_service_proxy_add_notify () can become tedious, because of the requirement to specify the types and deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/gupnp-binding-tool.html new/gupnp-0.17.2/doc/html/gupnp-binding-tool.html --- old/gupnp-0.17.1/doc/html/gupnp-binding-tool.html 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/gupnp-binding-tool.html 2011-08-04 22:51:01.000000000 +0200 @@ -33,7 +33,7 @@ <div class="cmdsynopsis"><p><code class="command">gupnp-binding-tool</code> [--prefix {PREFIX}] [--mode {client|server}] {SCPD file}</p></div> </div> <div class="refsect1"> -<a name="id440710"></a><h2>Description</h2> +<a name="id446719"></a><h2>Description</h2> <p> <span class="command"><strong>gupnp-binding-tool</strong></span> takes a <a class="glossterm" href="glossary.html#scpd"><em class="glossterm">SCPD file</em></a> and generates convenience C functions which call the actual GUPnP functions. The client-side bindings can be seen @@ -49,7 +49,7 @@ </p> </div> <div class="refsect1"> -<a name="id468794"></a><h2>Client side bindings</h2> +<a name="id446355"></a><h2>Client side bindings</h2> <p> As an example, this action: </p> @@ -138,7 +138,7 @@ </p> </div> <div class="refsect1"> -<a name="id468083"></a><h2>Server side bindings</h2> +<a name="id409742"></a><h2>Server side bindings</h2> <p> The corresponding server bindings for the same UPnP action (DeletePortMapping) look like this: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/gupnp.devhelp new/gupnp-0.17.2/doc/html/gupnp.devhelp --- old/gupnp-0.17.1/doc/html/gupnp.devhelp 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/gupnp.devhelp 2011-08-04 22:51:01.000000000 +0200 @@ -209,7 +209,6 @@ <function name="gupnp_context_manager_new ()" link="GUPnPContextManager.html#gupnp-context-manager-new"/> <function name="gupnp_context_manager_manage_control_point ()" link="GUPnPContextManager.html#gupnp-context-manager-manage-control-point"/> <function name="gupnp_context_manager_manage_root_device ()" link="GUPnPContextManager.html#gupnp-context-manager-manage-root-device"/> - <function name="The "context-manager" property" link="GUPnPContextManager.html#GUPnPContextManager--context-manager"/> <function name="The "main-context" property" link="GUPnPContextManager.html#GUPnPContextManager--main-context"/> <function name="The "port" property" link="GUPnPContextManager.html#GUPnPContextManager--port"/> <function name="The "context-available" signal" link="GUPnPContextManager.html#GUPnPContextManager-context-available"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/gupnp.devhelp2 new/gupnp-0.17.2/doc/html/gupnp.devhelp2 --- old/gupnp-0.17.1/doc/html/gupnp.devhelp2 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/gupnp.devhelp2 2011-08-04 22:51:01.000000000 +0200 @@ -206,10 +206,9 @@ <keyword type="property" name="The "session" property" link="GUPnPContext.html#GUPnPContext--session"/> <keyword type="property" name="The "subscription-timeout" property" link="GUPnPContext.html#GUPnPContext--subscription-timeout"/> <keyword type="struct" name="struct GUPnPContextManager" link="GUPnPContextManager.html#GUPnPContextManager-struct"/> - <keyword type="function" name="gupnp_context_manager_new ()" link="GUPnPContextManager.html#gupnp-context-manager-new"/> + <keyword type="function" name="gupnp_context_manager_new ()" link="GUPnPContextManager.html#gupnp-context-manager-new" deprecated="0.17.2: Use gupnp_context_manager_create()."/> <keyword type="function" name="gupnp_context_manager_manage_control_point ()" link="GUPnPContextManager.html#gupnp-context-manager-manage-control-point"/> <keyword type="function" name="gupnp_context_manager_manage_root_device ()" link="GUPnPContextManager.html#gupnp-context-manager-manage-root-device"/> - <keyword type="property" name="The "context-manager" property" link="GUPnPContextManager.html#GUPnPContextManager--context-manager"/> <keyword type="property" name="The "main-context" property" link="GUPnPContextManager.html#GUPnPContextManager--main-context"/> <keyword type="property" name="The "port" property" link="GUPnPContextManager.html#GUPnPContextManager--port"/> <keyword type="signal" name="The "context-available" signal" link="GUPnPContextManager.html#GUPnPContextManager-context-available"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/index.html new/gupnp-0.17.2/doc/html/index.html --- old/gupnp-0.17.1/doc/html/index.html 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/index.html 2011-08-04 22:51:01.000000000 +0200 @@ -14,11 +14,11 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GUPnP Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">Version 0.17.1 +<div><p class="releaseinfo">Version 0.17.2 </p></div> <div><p class="copyright">Copyright © 2007, 2008, 2009 OpenedHand Ltd, Nokia Corporation</p></div> <div><div class="legalnotice"> -<a name="id363580"></a><p> +<a name="id359757"></a><p> Permission is granted to copy, distribute and/or modify this document under the terms of the <em class="citetitle">GNU Free Documentation License</em>, Version 1.1 or any later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/index.sgml new/gupnp-0.17.2/doc/html/index.sgml --- old/gupnp-0.17.1/doc/html/index.sgml 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/index.sgml 2011-08-04 22:51:01.000000000 +0200 @@ -250,7 +250,6 @@ <ANCHOR id="gupnp-context-manager-manage-control-point" href="gupnp/GUPnPContextManager.html#gupnp-context-manager-manage-control-point"> <ANCHOR id="gupnp-context-manager-manage-root-device" href="gupnp/GUPnPContextManager.html#gupnp-context-manager-manage-root-device"> <ANCHOR id="GUPnPContextManager.property-details" href="gupnp/GUPnPContextManager.html#GUPnPContextManager.property-details"> -<ANCHOR id="GUPnPContextManager--context-manager" href="gupnp/GUPnPContextManager.html#GUPnPContextManager--context-manager"> <ANCHOR id="GUPnPContextManager--main-context" href="gupnp/GUPnPContextManager.html#GUPnPContextManager--main-context"> <ANCHOR id="GUPnPContextManager--port" href="gupnp/GUPnPContextManager.html#GUPnPContextManager--port"> <ANCHOR id="GUPnPContextManager.signal-details" href="gupnp/GUPnPContextManager.html#GUPnPContextManager.signal-details"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/ix01.html new/gupnp-0.17.2/doc/html/ix01.html --- old/gupnp-0.17.1/doc/html/ix01.html 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/ix01.html 2011-08-04 22:51:02.000000000 +0200 @@ -20,7 +20,7 @@ </tr></table> <div class="index"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id360462"></a>Index</h2></div></div></div> +<a name="id356639"></a>Index</h2></div></div></div> <div class="index"><div class="indexdiv"> <h3>G</h3> <dl> @@ -42,8 +42,6 @@ </dt> <dt>GUPnPContextManager::context-unavailable, <a class="indexterm" href="GUPnPContextManager.html#GUPnPContextManager-context-unavailable">The "context-unavailable" signal</a> </dt> -<dt>GUPnPContextManager:context-manager, <a class="indexterm" href="GUPnPContextManager.html#GUPnPContextManager--context-manager">The "context-manager" property</a> -</dt> <dt>GUPnPContextManager:main-context, <a class="indexterm" href="GUPnPContextManager.html#GUPnPContextManager--main-context">The "main-context" property</a> </dt> <dt>GUPnPContextManager:port, <a class="indexterm" href="GUPnPContextManager.html#GUPnPContextManager--port">The "port" property</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/doc/html/server-tutorial.html new/gupnp-0.17.2/doc/html/server-tutorial.html --- old/gupnp-0.17.1/doc/html/server-tutorial.html 2011-07-07 11:37:36.000000000 +0200 +++ new/gupnp-0.17.2/doc/html/server-tutorial.html 2011-08-04 22:51:01.000000000 +0200 @@ -24,7 +24,7 @@ <a name="server-tutorial"></a>Writing a UPnP Service</h2></div></div></div> <div class="simplesect"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id429071"></a>Introduction</h2></div></div></div> +<a name="id425248"></a>Introduction</h2></div></div></div> <p> This chapter explains how to implement a UPnP service using GUPnP. For this example we will create a virtual UPnP-enabled light bulb. @@ -41,7 +41,7 @@ </div> <div class="simplesect"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id409548"></a>Defining the Device</h2></div></div></div> +<a name="id405725"></a>Defining the Device</h2></div></div></div> <p> The first step is to write the <em class="firstterm">device description</em> file. This is a short XML document which describes the device and what @@ -117,7 +117,7 @@ </div> <div class="simplesect"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id425520"></a>Defining Services</h2></div></div></div> +<a name="id421697"></a>Defining Services</h2></div></div></div> <p> Becase we are using a standard service we can use the service description from the specification. This is the <code class="literal">SwitchPower1</code> @@ -210,7 +210,7 @@ </div> <div class="simplesect"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id442881"></a>Implementing the Device</h2></div></div></div> +<a name="id439058"></a>Implementing the Device</h2></div></div></div> <p> Before starting to implement the device, some boilerplate code is needed to initialise GUPnP. GLib types and threading needs to be initialised, @@ -247,7 +247,7 @@ </div> <div class="simplesect"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id400890"></a>Implementing a Service</h2></div></div></div> +<a name="id397067"></a>Implementing a Service</h2></div></div></div> <p> To implement a service we first fetch the #GUPnPService from the root device using gupnp_device_info_get_service() (#GUPnPRootDevice is a @@ -356,7 +356,7 @@ </div> <div class="simplesect"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id401024"></a>Generating Service-specific Wrappers</h2></div></div></div> +<a name="id397201"></a>Generating Service-specific Wrappers</h2></div></div></div> <p> Using service-specific wrappers can simplify the implementation of a service. Wrappers can be generated with <a class="xref" href="gupnp-binding-tool.html" title="gupnp-binding-tool"><span class="refentrytitle">gupnp-binding-tool</span>(1)</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/libgupnp/gupnp-context-manager.c new/gupnp-0.17.2/libgupnp/gupnp-context-manager.c --- old/gupnp-0.17.1/libgupnp/gupnp-context-manager.c 2011-07-06 19:23:02.000000000 +0200 +++ new/gupnp-0.17.2/libgupnp/gupnp-context-manager.c 2011-08-03 00:02:42.000000000 +0200 @@ -44,13 +44,11 @@ #include "gupnp-unix-context-manager.h" -G_DEFINE_TYPE (GUPnPContextManager, - gupnp_context_manager, - G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE (GUPnPContextManager, + gupnp_context_manager, + G_TYPE_OBJECT); struct _GUPnPContextManagerPrivate { - GMainContext *main_context; - guint port; GUPnPContextManager *impl; @@ -62,7 +60,6 @@ PROP_0, PROP_MAIN_CONTEXT, PROP_PORT, - PROP_CONTEXT_MANAGER }; enum { @@ -74,29 +71,12 @@ static guint signals[SIGNAL_LAST]; static void -on_context_available (GUPnPContextManager *impl, - GUPnPContext *context, - gpointer *user_data) -{ - GUPnPContextManager *manager = GUPNP_CONTEXT_MANAGER (user_data); - - /* Just proxy the signal */ - g_signal_emit (manager, - signals[CONTEXT_AVAILABLE], - 0, - context); -} - -static void -on_context_unavailable (GUPnPContextManager *impl, +on_context_unavailable (GUPnPContextManager *manager, GUPnPContext *context, gpointer *user_data) { - GUPnPContextManager *manager; GList *l; - manager = GUPNP_CONTEXT_MANAGER (user_data); - /* Make sure we don't send anything on now unavailable network */ g_object_set (context, "active", FALSE, NULL); @@ -132,12 +112,6 @@ l = l->next; } } - - /* Just proxy the signal */ - g_signal_emit (manager, - signals[CONTEXT_UNAVAILABLE], - 0, - context); } static void @@ -166,22 +140,11 @@ priv->port = g_value_get_uint (value); break; case PROP_MAIN_CONTEXT: - priv->main_context = g_value_get_pointer (value); - break; - case PROP_CONTEXT_MANAGER: - priv->impl = g_value_get_object (value); - if (priv->impl != NULL) { - priv->impl = g_object_ref (priv->impl); - - g_signal_connect (priv->impl, - "context-available", - G_CALLBACK (on_context_available), - manager); - g_signal_connect (priv->impl, - "context-unavailable", - G_CALLBACK (on_context_unavailable), - manager); - } + if (g_value_get_pointer (value) != NULL) + g_warning ("GUPnPContextManager:main-context is " + "deprecated. Use " + "g_main_context_push_thread_default()" + "instead."); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -204,10 +167,11 @@ g_value_set_uint (value, manager->priv->port); break; case PROP_MAIN_CONTEXT: - g_value_set_pointer (value, manager->priv->main_context); - break; - case PROP_CONTEXT_MANAGER: - g_value_set_object (value, manager->priv->impl); + g_warning ("GUPnPContextManager:main-context is deprecated. " + "Use g_main_context_push_thread_default()" + "instead."); + g_value_set_pointer (value, + g_main_context_get_thread_default ()); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -223,15 +187,6 @@ manager = GUPNP_CONTEXT_MANAGER (object); - if (manager->priv->impl != NULL) { - g_signal_handlers_disconnect_by_func (manager->priv->impl, - on_context_available, manager); - g_signal_handlers_disconnect_by_func (manager->priv->impl, - on_context_unavailable, manager); - g_object_unref (manager->priv->impl); - manager->priv->impl = NULL; - } - g_list_foreach (manager->priv->objects, (GFunc) g_object_unref, NULL); g_list_free (manager->priv->objects); manager->priv->objects = NULL; @@ -259,6 +214,9 @@ * * The #GMainContext to pass to created #GUPnPContext objects. Set to * NULL to use the default. + * + * Deprecated: 0.17.2: Use g_main_context_push_thread_default() + * instead. **/ g_object_class_install_property (object_class, @@ -292,27 +250,6 @@ G_PARAM_STATIC_BLURB)); /** - * GUPnPContextManager:context-manager: - * - * The actual GUPnPContextManager implementation used. This is an - * internal property and therefore Application developer should just - * ignore it. - * - **/ - g_object_class_install_property - (object_class, - PROP_CONTEXT_MANAGER, - g_param_spec_object ("context-manager", - "ContextManager", - "ContextManager implemention", - GUPNP_TYPE_CONTEXT_MANAGER, - G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); - - /** * GUPnPContextManager::context-available: * @context_manager: The #GUPnPContextManager that received the signal * @context: The now available #GUPnPContext @@ -340,38 +277,66 @@ * **/ signals[CONTEXT_UNAVAILABLE] = - g_signal_new ("context-unavailable", - GUPNP_TYPE_CONTEXT_MANAGER, - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, - GUPNP_TYPE_CONTEXT); + g_signal_new_class_handler + ("context-unavailable", + GUPNP_TYPE_CONTEXT_MANAGER, + G_SIGNAL_RUN_FIRST, + G_CALLBACK (on_context_unavailable), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, + GUPNP_TYPE_CONTEXT); } /** * gupnp_context_manager_new: - * @main_context: (allow-none): GMainContext to pass to created GUPnPContext objects. + * @main_context: (allow-none): Deprecated: 0.17.2: %NULL. If you want to use + * a different main context use + * g_main_context_push_thread_default() instead. * @port: Port to create contexts for, or 0 if you don't care what port is used. * - * Create a new #GUPnPContextManager. + * Factory-method to create a new #GUPnPContextManager. The final type of the + * #GUPnPContextManager depends on the compile-time selection or - in case of + * NetworkManager - on its availability during runtime. If it is not available, + * the implementation falls back to the basic Unix context manager instead. * - * Return value: A new #GUPnPContextManager object. + * Returns: (transfer full): A new #GUPnPContextManager object. + * Deprecated: 0.17.2: Use gupnp_context_manager_create(). **/ + GUPnPContextManager * gupnp_context_manager_new (GMainContext *main_context, guint port) { - GUPnPContextManager *manager; + if (main_context) + g_warning ("gupnp_context_manager_new::main_context is" + " deprecated. Use " + " g_main_context_push_thread_default() instead"); + + return gupnp_context_manager_create (port); +} +/** + * gupnp_context_manager_create: + * @port: Port to create contexts for, or 0 if you don't care what port is used. + * + * Factory-method to create a new #GUPnPContextManager. The final type of the + * #GUPnPContextManager depends on the compile-time selection or - in case of + * NetworkManager - on its availability during runtime. If it is not available, + * the implementation falls back to the basic Unix context manager instead. + * + * Returns: (transfer full): A new #GUPnPContextManager object. + **/ +GUPnPContextManager * +gupnp_context_manager_create (guint port) +{ GUPnPContextManager *impl; GType impl_type = G_TYPE_INVALID; #ifdef USE_NETWORK_MANAGER #include "gupnp-network-manager.h" - if (gupnp_network_manager_is_available (main_context)) + if (gupnp_network_manager_is_available ()) impl_type = GUPNP_TYPE_NETWORK_MANAGER; #elif USE_NETLINK #include "gupnp-linux-context-manager.h" @@ -382,18 +347,10 @@ impl_type = GUPNP_TYPE_UNIX_CONTEXT_MANAGER; impl = g_object_new (impl_type, - "main-context", main_context, "port", port, NULL); - manager = g_object_new (GUPNP_TYPE_CONTEXT_MANAGER, - "main-context", main_context, - "port", port, - "context-manager", impl, - NULL); - g_object_unref (impl); - - return manager; + return impl; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/libgupnp/gupnp-context-manager.h new/gupnp-0.17.2/libgupnp/gupnp-context-manager.h --- old/gupnp-0.17.1/libgupnp/gupnp-context-manager.h 2011-07-06 19:23:02.000000000 +0200 +++ new/gupnp-0.17.2/libgupnp/gupnp-context-manager.h 2011-08-03 00:02:42.000000000 +0200 @@ -79,9 +79,15 @@ void (* _gupnp_reserved4) (void); }; + +#ifndef GUPNP_DISABLE_DEPRECATED GUPnPContextManager * gupnp_context_manager_new (GMainContext *main_context, guint port); +#endif + +GUPnPContextManager * +gupnp_context_manager_create (guint port); void gupnp_context_manager_manage_control_point diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/libgupnp/gupnp-context.c new/gupnp-0.17.2/libgupnp/gupnp-context.c --- old/gupnp-0.17.1/libgupnp/gupnp-context.c 2011-07-06 19:23:02.000000000 +0200 +++ new/gupnp-0.17.2/libgupnp/gupnp-context.c 2011-08-04 22:41:23.000000000 +0200 @@ -50,6 +50,7 @@ #include "gupnp-context.h" #include "gupnp-context-private.h" +#include "gupnp-error.h" #include "gupnp-marshal.h" #include "gena-protocol.h" #include "http-headers.h" @@ -162,7 +163,7 @@ (SOUP_SESSION_IDLE_TIMEOUT, 60, SOUP_SESSION_ASYNC_CONTEXT, - gssdp_client_get_main_context (GSSDP_CLIENT (context)), + g_main_context_get_thread_default (), NULL); user_agent = g_strdup_printf ("%s GUPnP/" VERSION " DLNADOC/1.50", @@ -183,6 +184,24 @@ soup_session_add_feature_by_type (context->priv->session, SOUP_TYPE_CONTENT_DECODER); + /* Create the server already if the port is not null*/ + if (context->priv->port != 0) { + gupnp_context_get_server (context); + + if (context->priv->server == NULL) { + g_object_unref (context->priv->session); + context->priv->session = NULL; + + g_set_error (error, + GUPNP_SERVER_ERROR, + GUPNP_SERVER_ERROR_OTHER, + "Could not create HTTP server on port %d", + context->priv->port); + + return FALSE; + } + } + return TRUE; } @@ -300,6 +319,11 @@ context = GUPNP_CONTEXT (object); + if (context->priv->default_language) { + g_free (context->priv->default_language); + context->priv->default_language = NULL; + } + g_free (context->priv->server_url); /* Call super */ @@ -470,17 +494,21 @@ (SOUP_SERVER_PORT, context->priv->port, SOUP_SERVER_ASYNC_CONTEXT, - gssdp_client_get_main_context (GSSDP_CLIENT (context)), + g_main_context_get_thread_default (), SOUP_SERVER_INTERFACE, addr, NULL); g_object_unref (addr); - soup_server_add_handler (context->priv->server, NULL, - default_server_handler, context, - NULL); + if (context->priv->server) { + soup_server_add_handler (context->priv->server, + NULL, + default_server_handler, + context, + NULL); - soup_server_run_async (context->priv->server); + soup_server_run_async (context->priv->server); + } } return context->priv->server; @@ -517,7 +545,8 @@ /** * gupnp_context_new: - * @main_context: A #GMainContext, or %NULL to use the default one + * @main_context: Deprecated: 0.17.2: Always set to %NULL. If you want to use + * a different context, use g_main_context_push_thread_default(). * @interface: The network interface to use, or %NULL to auto-detect. * @port: Port to run on, or 0 if you don't care what port is used. * @error: A location to store a #GError, or %NULL @@ -533,10 +562,14 @@ guint port, GError **error) { + if (main_context) + g_warning ("gupnp_context_new::main_context is deprecated." + " Use g_main_context_push_thread_default()" + " instead"); + return g_initable_new (GUPNP_TYPE_CONTEXT, NULL, error, - "main-context", main_context, "interface", interface, "port", port, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/libgupnp/gupnp-linux-context-manager.c new/gupnp-0.17.2/libgupnp/gupnp-linux-context-manager.c --- old/gupnp-0.17.1/libgupnp/gupnp-linux-context-manager.c 2011-07-04 12:36:15.000000000 +0200 +++ new/gupnp-0.17.2/libgupnp/gupnp-linux-context-manager.c 2011-08-04 21:41:12.000000000 +0200 @@ -145,7 +145,6 @@ static void network_device_create_context (NetworkInterface *device) { - GMainContext *main_context; guint port; GError *error = NULL; @@ -163,7 +162,6 @@ device->flags &= ~NETWORK_INTERFACE_PRECONFIGURED; g_object_get (device->manager, - "main-context", &main_context, "port", &port, NULL); @@ -171,7 +169,6 @@ device->context = g_initable_new (GUPNP_TYPE_CONTEXT, NULL, &error, - "main-context", main_context, "interface", device->name, "network", device->essid, "port", port, @@ -347,18 +344,13 @@ return TRUE; } else { - GMainContext *main_context; - self->priv->netlink_socket_source = g_socket_create_source (self->priv->netlink_socket, G_IO_IN | G_IO_PRI, NULL); - g_object_get (self, - "main-context", &main_context, - NULL); g_source_attach (self->priv->netlink_socket_source, - main_context); + g_main_context_get_thread_default ()); g_source_set_callback (self->priv->netlink_socket_source, (GSourceFunc) @@ -642,14 +634,9 @@ GObjectClass *parent_class; GUPnPLinuxContextManager *self; GError *error = NULL; - GMainContext *main_context; self = GUPNP_LINUX_CONTEXT_MANAGER (object); - g_object_get (self, - "main-context", &main_context, - NULL); - if (!create_ioctl_socket (self, &error)) goto cleanup; @@ -659,7 +646,7 @@ self->priv->bootstrap_source = g_idle_source_new (); g_source_attach (self->priv->bootstrap_source, - main_context); + g_main_context_get_thread_default ()); g_source_set_callback (self->priv->bootstrap_source, (GSourceFunc) on_bootstrap, self, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/libgupnp/gupnp-network-manager.c new/gupnp-0.17.2/libgupnp/gupnp-network-manager.c --- old/gupnp-0.17.1/libgupnp/gupnp-network-manager.c 2011-07-06 19:23:02.000000000 +0200 +++ new/gupnp-0.17.2/libgupnp/gupnp-network-manager.c 2011-08-03 00:02:42.000000000 +0200 @@ -158,21 +158,18 @@ { GUPnPNetworkManager *manager = (GUPnPNetworkManager *) data; GUPnPContext *context; - GMainContext *main_context; guint port; GError *error = NULL; manager->priv->idle_context_creation_src = NULL; g_object_get (manager, - "main-context", &main_context, "port", &port, NULL); context = g_initable_new (GUPNP_TYPE_CONTEXT, NULL, &error, - "main-context", main_context, "interface", LOOPBACK_IFACE, "port", port, NULL); @@ -195,14 +192,12 @@ create_context_for_device (NMDevice *nm_device) { GError *error = NULL; - GMainContext *main_context; guint port; GVariant *value; char *iface; char *ssid = NULL; g_object_get (nm_device->manager, - "main-context", &main_context, "port", &port, NULL); @@ -233,7 +228,6 @@ nm_device->context = g_initable_new (GUPNP_TYPE_CONTEXT, NULL, &error, - "main-context", main_context, "interface", iface, "network", ssid, "port", port, @@ -274,20 +268,6 @@ create_context_for_device (nm_device); } -static GMainContext * -push_thread_main_context (GUPnPNetworkManager *manager) -{ - GMainContext *main_context; - - g_object_get (manager, - "main-context", &main_context, - NULL); - - g_main_context_push_thread_default (main_context); - - return main_context; -} - static void on_wifi_device_activated (NMDevice *nm_device) { @@ -310,9 +290,6 @@ if (G_UNLIKELY (ap_path == NULL)) create_context_for_device (nm_device); else { - GMainContext *main_context; - - main_context = push_thread_main_context (nm_device->manager); g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, NULL, @@ -322,7 +299,6 @@ nm_device->manager->priv->cancellable, ap_proxy_new_cb, nm_device); - g_main_context_pop_thread_default (main_context); } g_variant_unref (value); @@ -467,9 +443,6 @@ if (type == NM_DEVICE_TYPE_WIFI) { const char *path; - GMainContext *main_context; - - main_context = push_thread_main_context (manager); path = g_dbus_proxy_get_object_path (nm_device->proxy); g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, @@ -481,7 +454,6 @@ manager->priv->cancellable, wifi_proxy_new_cb, nm_device); - g_main_context_pop_thread_default (main_context); } else use_new_device (manager, nm_device); } @@ -511,14 +483,12 @@ if (g_strcmp0 (signal_name, "DeviceAdded") == 0) { char *device_path = NULL; - GMainContext *main_context; g_variant_get_child (parameters, 0, "o", &device_path); if (G_UNLIKELY (device_path == NULL)) return; - main_context = push_thread_main_context (manager); g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, NULL, @@ -528,7 +498,6 @@ manager->priv->cancellable, device_proxy_new_cb, manager); - g_main_context_pop_thread_default (main_context); g_free (device_path); } else if (g_strcmp0 (signal_name, "DeviceRemoved") == 0) { GList *device_node; @@ -570,7 +539,6 @@ GVariantIter *device_iter; char* device_path; GError *error = NULL; - GMainContext *main_context; manager = GUPNP_NETWORK_MANAGER (user_data); @@ -587,7 +555,6 @@ } g_variant_get_child (ret, 0, "ao", &device_iter); - main_context = push_thread_main_context (manager); while (g_variant_iter_loop (device_iter, "o", &device_path)) g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, @@ -598,7 +565,6 @@ manager->priv->cancellable, device_proxy_new_cb, user_data); - g_main_context_pop_thread_default (main_context); g_variant_iter_free (device_iter); g_variant_unref (ret); @@ -607,18 +573,12 @@ static void schedule_loopback_context_creation (GUPnPNetworkManager *manager) { - GMainContext *main_context; - - g_object_get (manager, - "main-context", &main_context, - NULL); - /* Create contexts in mainloop so that is happens after user has hooked * to the "context-available" signal. */ manager->priv->idle_context_creation_src = g_idle_source_new (); g_source_attach (manager->priv->idle_context_creation_src, - main_context); + g_main_context_get_thread_default ()); g_source_set_callback (manager->priv->idle_context_creation_src, create_loopback_context, manager, @@ -630,7 +590,6 @@ init_network_manager (GUPnPNetworkManager *manager) { GUPnPNetworkManagerPrivate *priv; - GMainContext *main_context; GError *error; priv = manager->priv; @@ -659,7 +618,6 @@ manager); - main_context = push_thread_main_context (manager); g_dbus_proxy_call (priv->manager_proxy, "GetDevices", NULL, @@ -668,7 +626,6 @@ priv->cancellable, get_devices_cb, manager); - g_main_context_pop_thread_default (main_context); } static void @@ -754,7 +711,7 @@ } gboolean -gupnp_network_manager_is_available (GMainContext *main_context) +gupnp_network_manager_is_available () { GDBusProxy *dbus_proxy; GVariant *ret_values; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/libgupnp/gupnp-network-manager.h new/gupnp-0.17.2/libgupnp/gupnp-network-manager.h --- old/gupnp-0.17.1/libgupnp/gupnp-network-manager.h 2011-07-06 19:23:02.000000000 +0200 +++ new/gupnp-0.17.2/libgupnp/gupnp-network-manager.h 2011-08-03 00:02:42.000000000 +0200 @@ -70,7 +70,7 @@ } GUPnPNetworkManagerClass; gboolean -gupnp_network_manager_is_available (GMainContext *main_context); +gupnp_network_manager_is_available (); G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/libgupnp/gupnp-service-proxy.c new/gupnp-0.17.2/libgupnp/gupnp-service-proxy.c --- old/gupnp-0.17.1/libgupnp/gupnp-service-proxy.c 2011-07-04 12:36:15.000000000 +0200 +++ new/gupnp-0.17.2/libgupnp/gupnp-service-proxy.c 2011-08-03 00:02:42.000000000 +0200 @@ -430,17 +430,14 @@ GError **error, va_list var_args) { - GUPnPContext *context; - GMainContext *main_context; GMainLoop *main_loop; GUPnPServiceProxyAction *handle; g_return_val_if_fail (GUPNP_IS_SERVICE_PROXY (proxy), FALSE); g_return_val_if_fail (action, FALSE); - context = gupnp_service_info_get_context (GUPNP_SERVICE_INFO (proxy)); - main_context = gssdp_client_get_main_context (GSSDP_CLIENT (context)); - main_loop = g_main_loop_new (main_context, TRUE); + main_loop = g_main_loop_new (g_main_context_get_thread_default (), + TRUE); handle = gupnp_service_proxy_begin_action_valist (proxy, action, @@ -485,17 +482,14 @@ GHashTable *in_hash, GHashTable *out_hash) { - GUPnPContext *context; - GMainContext *main_context; GMainLoop *main_loop; GUPnPServiceProxyAction *handle; g_return_val_if_fail (GUPNP_IS_SERVICE_PROXY (proxy), FALSE); g_return_val_if_fail (action, FALSE); - context = gupnp_service_info_get_context (GUPNP_SERVICE_INFO (proxy)); - main_context = gssdp_client_get_main_context (GSSDP_CLIENT (context)); - main_loop = g_main_loop_new (main_context, TRUE); + main_loop = g_main_loop_new (g_main_context_get_thread_default (), + TRUE); handle = gupnp_service_proxy_begin_action_hash (proxy, action, @@ -554,17 +548,14 @@ GList *out_types, GList **out_values) { - GUPnPContext *context; - GMainContext *main_context; GMainLoop *main_loop; GUPnPServiceProxyAction *handle; g_return_val_if_fail (GUPNP_IS_SERVICE_PROXY (proxy), FALSE); g_return_val_if_fail (action, FALSE); - context = gupnp_service_info_get_context (GUPNP_SERVICE_INFO (proxy)); - main_context = gssdp_client_get_main_context (GSSDP_CLIENT (context)); - main_loop = g_main_loop_new (main_context, TRUE); + main_loop = g_main_loop_new (g_main_context_get_thread_default (), + TRUE); handle = gupnp_service_proxy_begin_action_list (proxy, action, @@ -1813,19 +1804,12 @@ proxy->priv->pending_notifies = g_list_append (proxy->priv->pending_notifies, emit_notify_data); if (!proxy->priv->notify_idle_src) { - GUPnPContext *context; - GMainContext *main_context; - - context = gupnp_service_info_get_context - (GUPNP_SERVICE_INFO (proxy)); - main_context = gssdp_client_get_main_context - (GSSDP_CLIENT (context)); - proxy->priv->notify_idle_src = g_idle_source_new(); g_source_set_callback (proxy->priv->notify_idle_src, emit_notifications, proxy, NULL); - g_source_attach (proxy->priv->notify_idle_src, main_context); + g_source_attach (proxy->priv->notify_idle_src, + g_main_context_get_thread_default ()); g_source_unref (proxy->priv->notify_idle_src); } @@ -1962,14 +1946,6 @@ } if (strncmp (hdr, "Second-", strlen ("Second-")) == 0) { - GUPnPContext *context; - GMainContext *main_context; - - context = gupnp_service_info_get_context - (GUPNP_SERVICE_INFO (proxy)); - main_context = gssdp_client_get_main_context - (GSSDP_CLIENT (context)); - /* We have a finite timeout */ timeout = atoi (hdr + strlen ("Second-")); @@ -1993,7 +1969,7 @@ subscription_expire, proxy, NULL); g_source_attach (proxy->priv->subscription_timeout_src, - main_context); + g_main_context_get_thread_default ()); g_source_unref (proxy->priv->subscription_timeout_src); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/libgupnp/gupnp-service.c new/gupnp-0.17.2/libgupnp/gupnp-service.c --- old/gupnp-0.17.1/libgupnp/gupnp-service.c 2011-07-04 12:36:15.000000000 +0200 +++ new/gupnp-0.17.2/libgupnp/gupnp-service.c 2011-08-03 00:02:42.000000000 +0200 @@ -107,9 +107,6 @@ gupnp_service_get_session (GUPnPService *service) { if (! service->priv->session) { - GUPnPContext *context = - gupnp_service_info_get_context (GUPNP_SERVICE_INFO (service)); - /* Create a dedicated session for this service to * ensure that notifications are sent in the proper * order. The session from GUPnPContext may use @@ -118,7 +115,7 @@ service->priv->session = soup_session_async_new_with_options (SOUP_SESSION_IDLE_TIMEOUT, 60, SOUP_SESSION_ASYNC_CONTEXT, - gssdp_client_get_main_context (GSSDP_CLIENT (context)), + g_main_context_get_thread_default (), SOUP_SESSION_MAX_CONNS_PER_HOST, 1, NULL); @@ -1145,7 +1142,6 @@ SubscriptionData *data; char *start, *end, *uri; GUPnPContext *context; - GMainContext *main_context; data = g_slice_new0 (SubscriptionData); @@ -1188,8 +1184,8 @@ NULL); context = gupnp_service_info_get_context (GUPNP_SERVICE_INFO (service)); - main_context = gssdp_client_get_main_context (GSSDP_CLIENT (context)); - g_source_attach (data->timeout_src, main_context); + g_source_attach (data->timeout_src, + g_main_context_get_thread_default ()); g_source_unref (data->timeout_src); @@ -1212,7 +1208,6 @@ { SubscriptionData *data; GUPnPContext *context; - GMainContext *main_context; data = g_hash_table_lookup (service->priv->subscriptions, sid); if (!data) { @@ -1234,8 +1229,8 @@ NULL); context = gupnp_service_info_get_context (GUPNP_SERVICE_INFO (service)); - main_context = gssdp_client_get_main_context (GSSDP_CLIENT (context)); - g_source_attach (data->timeout_src, main_context); + g_source_attach (data->timeout_src, + g_main_context_get_thread_default ()); g_source_unref (data->timeout_src); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/libgupnp/gupnp-unix-context-manager.c new/gupnp-0.17.2/libgupnp/gupnp-unix-context-manager.c --- old/gupnp-0.17.1/libgupnp/gupnp-unix-context-manager.c 2011-07-06 19:23:03.000000000 +0200 +++ new/gupnp-0.17.2/libgupnp/gupnp-unix-context-manager.c 2011-08-03 00:02:42.000000000 +0200 @@ -64,13 +64,11 @@ const char *interface) { GUPnPContext *context; - GMainContext *main_context; guint port; GError *error; g_object_get (manager, - "main-context", &main_context, "port", &port, NULL); @@ -78,7 +76,6 @@ context = g_initable_new (GUPNP_TYPE_CONTEXT, NULL, &error, - "main-context", main_context, "interface", interface, "port", port, NULL); @@ -173,20 +170,14 @@ static void schedule_contexts_creation (GUPnPUnixContextManager *manager) { - GMainContext *main_context; - manager->priv->idle_context_creation_src = NULL; - g_object_get (manager, - "main-context", &main_context, - NULL); - /* Create contexts in mainloop so that is happens after user has hooked * to the "context-available" signal. */ manager->priv->idle_context_creation_src = g_idle_source_new (); g_source_attach (manager->priv->idle_context_creation_src, - main_context); + g_main_context_get_thread_default ()); g_source_set_callback (manager->priv->idle_context_creation_src, create_contexts, manager, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/tests/test-browsing.c new/gupnp-0.17.2/tests/test-browsing.c --- old/gupnp-0.17.1/tests/test-browsing.c 2011-06-28 09:05:06.000000000 +0200 +++ new/gupnp-0.17.2/tests/test-browsing.c 2011-08-03 00:02:42.000000000 +0200 @@ -102,7 +102,7 @@ setlocale (LC_ALL, ""); error = NULL; - context = gupnp_context_new (NULL, NULL, 0, &error); + context = g_initable_new (GUPNP_TYPE_CONTEXT, NULL, &error, NULL); if (error) { g_printerr ("Error creating the GUPnP context: %s\n", error->message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/tests/test-introspection.c new/gupnp-0.17.2/tests/test-introspection.c --- old/gupnp-0.17.1/tests/test-introspection.c 2011-06-28 09:05:06.000000000 +0200 +++ new/gupnp-0.17.2/tests/test-introspection.c 2011-08-03 00:02:42.000000000 +0200 @@ -257,7 +257,7 @@ g_type_init (); error = NULL; - context = gupnp_context_new (NULL, NULL, 0, &error); + context = g_initable_new (GUPNP_TYPE_CONTEXT, NULL, &error, NULL); if (error) { g_printerr ("Error creating the GUPnP context: %s\n", error->message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/tests/test-proxy.c new/gupnp-0.17.2/tests/test-proxy.c --- old/gupnp-0.17.1/tests/test-proxy.c 2011-06-28 09:05:06.000000000 +0200 +++ new/gupnp-0.17.2/tests/test-proxy.c 2011-08-03 00:02:42.000000000 +0200 @@ -158,7 +158,7 @@ setlocale (LC_ALL, ""); error = NULL; - context = gupnp_context_new (NULL, NULL, 0, &error); + context = g_initable_new (GUPNP_TYPE_CONTEXT, NULL, &error, NULL); if (error) { g_printerr ("Error creating the GUPnP context: %s\n", error->message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-0.17.1/tests/test-server.c new/gupnp-0.17.2/tests/test-server.c --- old/gupnp-0.17.1/tests/test-server.c 2011-06-28 09:05:06.000000000 +0200 +++ new/gupnp-0.17.2/tests/test-server.c 2011-08-03 00:02:42.000000000 +0200 @@ -75,7 +75,7 @@ setlocale (LC_ALL, ""); error = NULL; - context = gupnp_context_new (NULL, NULL, 0, &error); + context = g_initable_new (GUPNP_TYPE_CONTEXT, NULL, &error, NULL); if (error) { g_printerr ("Error creating the GUPnP context: %s\n", error->message); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org