Hello community, here is the log from the commit of package zeitgeist for openSUSE:Factory checked in at 2013-06-25 07:39:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zeitgeist (Old) and /work/SRC/openSUSE:Factory/.zeitgeist.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zeitgeist" Changes: -------- --- /work/SRC/openSUSE:Factory/zeitgeist/zeitgeist.changes 2013-04-26 15:54:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zeitgeist.new/zeitgeist.changes 2013-06-25 14:47:50.000000000 +0200 @@ -1,0 +2,21 @@ +Sat Jun 22 10:11:35 UTC 2013 - [email protected] + +- Update to version 0.9.14: + + Libzeitgeist: Fix managing and tracking registered Monitors. + +------------------------------------------------------------------- +Thu May 30 07:10:02 UTC 2013 - [email protected] + +- Update to version 0.9.13: + + Engine: + - Adjust resetting of statement to proper sequence. + - Add custom memory PRAGMA to improve memory consumption. + + Libzeitgeist: + - Add default memory PRAGMA to be used by clients. + + FTS: + - Improve FTS memory consumption. + + Overall: + - Fix compilation breaks for --enable-datahub + --disable-downloads-monitor. + +------------------------------------------------------------------- Old: ---- zeitgeist-0.9.12.tar.xz New: ---- zeitgeist-0.9.14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zeitgeist.spec ++++++ --- /var/tmp/diff_new_pack.GDawby/_old 2013-06-25 14:47:51.000000000 +0200 +++ /var/tmp/diff_new_pack.GDawby/_new 2013-06-25 14:47:51.000000000 +0200 @@ -18,7 +18,7 @@ Name: zeitgeist -Version: 0.9.12 +Version: 0.9.14 Release: 0 Summary: Zeitgeist Engine License: LGPL-2.1+ and GPL-2.0+ ++++++ zeitgeist-0.9.12.tar.xz -> zeitgeist-0.9.14.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/AUTHORS new/zeitgeist-0.9.14/AUTHORS --- old/zeitgeist-0.9.12/AUTHORS 2013-03-19 07:01:48.000000000 +0100 +++ new/zeitgeist-0.9.14/AUTHORS 2013-06-17 08:40:08.000000000 +0200 @@ -2,6 +2,7 @@ Michael Hruby <[email protected]> Seif Lotfy <[email protected]> Siegfried-Angel Gevatter Pujals <[email protected]> + Rico Tzschichholz <[email protected]> Contributors: Christian Dywan <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/NEWS new/zeitgeist-0.9.14/NEWS --- old/zeitgeist-0.9.12/NEWS 2013-04-12 23:51:28.000000000 +0200 +++ new/zeitgeist-0.9.14/NEWS 2013-06-18 04:41:31.000000000 +0200 @@ -1,3 +1,28 @@ +2013-xx-xx: Zeitgeist 0.9.14 (1.0 Beta 6) "Diamond" +--------------------------------------------------------------- + +Libzeitgeist: + - Fix managing and tracking registered Monitors + + +2013-05-29: Zeitgeist 0.9.13 (1.0 Beta 5) "Silence is Gold" +--------------------------------------------------------------- + +Engine: + - Adjust resetting of statement to proper sequence + - Add custom memory PRAGMA to improve memory consumption + +Libzeitgeist: + - Add default memory PRAGMA to be used by clients + +FTS: + - Improve FTS memory consumption + +Overall: + - Fix compilation breaks for --enable-datahub --disable-downloads-monitor + +This release is the fifth beta which will lead to zeitgeist 1.0 + 2013-04-12: Zeitgeist 0.9.12 (1.0 Beta 4) "Happy Go Lucky" --------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/configure new/zeitgeist-0.9.14/configure --- old/zeitgeist-0.9.12/configure 2013-04-13 10:09:27.000000000 +0200 +++ new/zeitgeist-0.9.14/configure 2013-06-18 04:43:42.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for zeitgeist 0.9.12. +# Generated by GNU Autoconf 2.69 for zeitgeist 0.9.14. # # Report bugs to <[email protected]>. # @@ -650,8 +650,8 @@ # Identity of this package. PACKAGE_NAME='zeitgeist' PACKAGE_TARNAME='zeitgeist' -PACKAGE_VERSION='0.9.12' -PACKAGE_STRING='zeitgeist 0.9.12' +PACKAGE_VERSION='0.9.14' +PACKAGE_STRING='zeitgeist 0.9.14' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1512,7 +1512,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zeitgeist 0.9.12 to adapt to many kinds of systems. +\`configure' configures zeitgeist 0.9.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1582,7 +1582,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zeitgeist 0.9.12:";; + short | recursive ) echo "Configuration of zeitgeist 0.9.14:";; esac cat <<\_ACEOF @@ -1730,7 +1730,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zeitgeist configure 0.9.12 +zeitgeist configure 0.9.14 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2220,7 +2220,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zeitgeist $as_me 0.9.12, which was +It was created by zeitgeist $as_me 0.9.14, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3039,7 +3039,7 @@ # Define the identity of the package. PACKAGE='zeitgeist' - VERSION='0.9.12' + VERSION='0.9.14' cat >>confdefs.h <<_ACEOF @@ -15687,11 +15687,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&5 $as_echo "$as_me: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&2;} else - if test -n "0.18.0"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.18.0" >&5 -$as_echo_n "checking $VALAC is at least version 0.18.0... " >&6; } + if test -n "0.20.0"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.20.0" >&5 +$as_echo_n "checking $VALAC is at least version 0.20.0... " >&6; } am__vala_version=`$VALAC --version | sed 's/Vala *//'` - as_arg_v1=0.18.0 + as_arg_v1=0.20.0 as_arg_v2="$am__vala_version" awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null case $? in #( @@ -15704,7 +15704,7 @@ 2) : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "Vala 0.18.0 not found." "$LINENO" 5 ;; #( + as_fn_error $? "Vala 0.20.0 not found." "$LINENO" 5 ;; #( *) : ;; esac @@ -17784,6 +17784,10 @@ $as_echo "#define DOWNLOADS_MONITOR_ENABLED 1" >>confdefs.h +else + +$as_echo "#define DOWNLOADS_MONITOR_ENABLED 0" >>confdefs.h + fi if test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes"; then DOWNLOADS_MONITOR_ENABLED_TRUE= @@ -18786,7 +18790,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by zeitgeist $as_me 0.9.12, which was +This file was extended by zeitgeist $as_me 0.9.14, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18852,7 +18856,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -zeitgeist config.status 0.9.12 +zeitgeist config.status 0.9.14 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/configure.ac new/zeitgeist-0.9.14/configure.ac --- old/zeitgeist-0.9.12/configure.ac 2013-04-13 10:09:15.000000000 +0200 +++ new/zeitgeist-0.9.14/configure.ac 2013-06-17 08:40:08.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([zeitgeist], [0.9.12], [[email protected]], [zeitgeist]) +AC_INIT([zeitgeist], [0.9.14], [[email protected]], [zeitgeist]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS(config.h) @@ -13,7 +13,7 @@ AC_DISABLE_STATIC AC_PROG_LIBTOOL -AM_PROG_VALAC([0.18.0]) +AM_PROG_VALAC([0.20.0]) AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No Vala compiler found."])]) AM_SILENT_RULES([yes]) @@ -189,6 +189,8 @@ if test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes"; then AC_DEFINE([DOWNLOADS_MONITOR_ENABLED], [1], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?]) +else + AC_DEFINE([DOWNLOADS_MONITOR_ENABLED], [0], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?]) fi AM_CONDITIONAL(DOWNLOADS_MONITOR_ENABLED, test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/ccomments/log.c new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/ccomments/log.c --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/ccomments/log.c 2013-04-12 23:53:45.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/ccomments/log.c 2013-06-18 04:44:37.000000000 +0200 @@ -243,22 +243,9 @@ * zeitgeist_log_remove_monitor: * @self: the <link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> instance * @monitor: (in) (transfer full): . A <link linkend="ZeitgeistMonitor"><type>ZeitgeistMonitor</type></link> to report back inserts and deletes - * @_callback_: (scope async): callback to call when the request is satisfied - * @_user_data_: (closure): the data to pass to @_callback_ function - * - * Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged. - * - * <emphasis>See also</emphasis>: <link linkend="zeitgeist-log-remove-monitor-finish"><function>zeitgeist_log_remove_monitor_finish()</function></link> - */ -/** - * zeitgeist_log_remove_monitor_finish: - * @self: the <link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> instance - * @_res_: a <link linkend="GAsyncResult"><type>GAsyncResult</type></link> * @error: location to store the error occuring, or %NULL to ignore * * Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged. - * - * <emphasis>See also</emphasis>: <link linkend="zeitgeist-log-remove-monitor"><function>zeitgeist_log_remove_monitor()</function></link> */ /** * zeitgeist_log_get_version: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ZeitgeistLog.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ZeitgeistLog.html --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ZeitgeistLog.html 2013-04-12 23:53:51.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ZeitgeistLog.html 2013-06-18 04:44:47.000000000 +0200 @@ -131,10 +131,6 @@ <em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>); <span class="returnvalue">void</span> <a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor" title="zeitgeist_log_remove_monitor ()">zeitgeist_log_remove_monitor</a> (<em class="parameter"><code><a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> *self</code></em>, <em class="parameter"><code><a class="link" href="ZeitgeistMonitor.html" title="ZeitgeistMonitor"><span class="type">ZeitgeistMonitor</span></a> *monitor</code></em>, - <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> _callback_</code></em>, - <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> _user_data_</code></em>); -<span class="returnvalue">void</span> <a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish" title="zeitgeist_log_remove_monitor_finish ()">zeitgeist_log_remove_monitor_finish</a> (<em class="parameter"><code><a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> *self</code></em>, - <em class="parameter"><code><a href="../gio/GAsyncResult.html"><span class="type">GAsyncResult</span></a> *_res_</code></em>, <em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>); <span class="returnvalue">void</span> <a class="link" href="ZeitgeistLog.html#zeitgeist-log-get-version" title="zeitgeist_log_get_version ()">zeitgeist_log_get_version</a> (<em class="parameter"><code><a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> *self</code></em>, <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a> *major</code></em>, @@ -998,14 +994,10 @@ <a name="zeitgeist-log-remove-monitor"></a><h3>zeitgeist_log_remove_monitor ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> zeitgeist_log_remove_monitor (<em class="parameter"><code><a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> *self</code></em>, <em class="parameter"><code><a class="link" href="ZeitgeistMonitor.html" title="ZeitgeistMonitor"><span class="type">ZeitgeistMonitor</span></a> *monitor</code></em>, - <em class="parameter"><code><a href="../gio/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> _callback_</code></em>, - <em class="parameter"><code><a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> _user_data_</code></em>);</pre> + <em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre> <p> Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged. </p> -<p> -<span class="emphasis"><em>See also</em></span>: <a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish" title="zeitgeist_log_remove_monitor_finish ()"><code class="function"><a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish" title="zeitgeist_log_remove_monitor_finish ()"><code class="function">zeitgeist_log_remove_monitor_finish()</code></a></code></a> -</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -1019,43 +1011,6 @@ </td> </tr> <tr> -<td><p><span class="term"><em class="parameter"><code>_callback_</code></em> :</span></p></td> -<td>callback to call when the request is satisfied. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span> -</td> -</tr> -<tr> -<td><p><span class="term"><em class="parameter"><code>_user_data_</code></em> :</span></p></td> -<td>the data to pass to <em class="parameter"><code>_callback_</code></em> function. <span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span> -</td> -</tr> -</tbody> -</table></div> -</div> -<hr> -<div class="refsect2"> -<a name="zeitgeist-log-remove-monitor-finish"></a><h3>zeitgeist_log_remove_monitor_finish ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> zeitgeist_log_remove_monitor_finish (<em class="parameter"><code><a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> *self</code></em>, - <em class="parameter"><code><a href="../gio/GAsyncResult.html"><span class="type">GAsyncResult</span></a> *_res_</code></em>, - <em class="parameter"><code><a href="../glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre> -<p> -Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged. -</p> -<p> -<span class="emphasis"><em>See also</em></span>: <a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor" title="zeitgeist_log_remove_monitor ()"><code class="function"><a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor" title="zeitgeist_log_remove_monitor ()"><code class="function">zeitgeist_log_remove_monitor()</code></a></code></a> -</p> -<div class="variablelist"><table border="0"> -<col align="left" valign="top"> -<tbody> -<tr> -<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td> -<td>the <a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog"><span class="type">ZeitgeistLog</span></a> instance</td> -</tr> -<tr> -<td><p><span class="term"><em class="parameter"><code>_res_</code></em> :</span></p></td> -<td>a <a href="../gio/GAsyncResult.html"><span class="type">GAsyncResult</span></a> -</td> -</tr> -<tr> <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td> <td>location to store the error occuring, or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td> </tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/api-index-full.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/api-index-full.html --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/api-index-full.html 2013-04-12 23:53:51.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/api-index-full.html 2013-06-18 04:44:47.000000000 +0200 @@ -727,10 +727,6 @@ </dt> <dd></dd> <dt> -<a class="link" href="ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish" title="zeitgeist_log_remove_monitor_finish ()">zeitgeist_log_remove_monitor_finish</a>, function in <a class="link" href="ZeitgeistLog.html" title="ZeitgeistLog">ZeitgeistLog</a> -</dt> -<dd></dd> -<dt> <a class="link" href="zeitgeist-2.0-mimetype.html#zeitgeist-manifestation-for-uri" title="zeitgeist_manifestation_for_uri ()">zeitgeist_manifestation_for_uri</a>, function in <a class="link" href="zeitgeist-2.0-mimetype.html" title="mimetype">mimetype</a> </dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch01.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch01.html --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch01.html 2013-04-12 23:53:51.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch01.html 2013-06-18 04:44:47.000000000 +0200 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp2006560"></a>Classes</h2></div></div></div> +<a name="idp2474384"></a>Classes</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="ZeitgeistEvent.html">ZeitgeistEvent</a></span><span class="refpurpose"> — Event objects abstract Zeitgeist events</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch02.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch02.html --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch02.html 2013-04-12 23:53:51.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch02.html 2013-06-18 04:44:47.000000000 +0200 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp1946816"></a>Utility Functions</h2></div></div></div> +<a name="idp119088"></a>Utility Functions</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="zeitgeist-2.0-mimetype.html">mimetype</a></span><span class="refpurpose"></span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch03.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch03.html --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch03.html 2013-04-12 23:53:51.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch03.html 2013-06-18 04:44:47.000000000 +0200 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp2730048"></a>Enumerations and Macros</h2></div></div></div> +<a name="idp121472"></a>Enumerations and Macros</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="zeitgeist-2.0-enumerations.html">enumerations</a></span><span class="refpurpose"></span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch04.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch04.html --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch04.html 2013-04-12 23:53:51.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch04.html 2013-06-18 04:44:47.000000000 +0200 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp3368496"></a>API for Zeitgeist Extensions</h2></div></div></div> +<a name="idp41104"></a>API for Zeitgeist Extensions</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="ZeitgeistIndex.html">ZeitgeistIndex</a></span><span class="refpurpose"> — Query the Zeitgeist Full Text Search Extension</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch05.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch05.html --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/ch05.html 2013-04-12 23:53:51.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/ch05.html 2013-06-18 04:44:47.000000000 +0200 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp4340624"></a>Zeitgeist D-Bus API Reference</h2></div></div></div> +<a name="idp43520"></a>Zeitgeist D-Bus API Reference</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="docs-org-gnome-zeitgeist-Index.html">org.gnome.zeitgeist.Index</a></span><span class="refpurpose"></span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/index.sgml new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/index.sgml --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/index.sgml 2013-04-12 23:53:50.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/index.sgml 2013-06-18 04:44:45.000000000 +0200 @@ -73,7 +73,6 @@ <ANCHOR id="zeitgeist-log-quit-finish" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-quit-finish"> <ANCHOR id="zeitgeist-log-install-monitor" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-install-monitor"> <ANCHOR id="zeitgeist-log-remove-monitor" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-remove-monitor"> -<ANCHOR id="zeitgeist-log-remove-monitor-finish" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish"> <ANCHOR id="zeitgeist-log-get-version" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-get-version"> <ANCHOR id="zeitgeist-log-get-extensions" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-get-extensions"> <ANCHOR id="zeitgeist-log-datapath" href="zeitgeist-2.0/ZeitgeistLog.html#zeitgeist-log-datapath"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/zeitgeist-2.0.devhelp2 new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/zeitgeist-2.0.devhelp2 --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/html/zeitgeist-2.0.devhelp2 2013-04-12 23:53:51.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/html/zeitgeist-2.0.devhelp2 2013-06-18 04:44:45.000000000 +0200 @@ -98,7 +98,6 @@ <keyword type="function" name="zeitgeist_log_quit_finish ()" link="ZeitgeistLog.html#zeitgeist-log-quit-finish"/> <keyword type="function" name="zeitgeist_log_install_monitor ()" link="ZeitgeistLog.html#zeitgeist-log-install-monitor"/> <keyword type="function" name="zeitgeist_log_remove_monitor ()" link="ZeitgeistLog.html#zeitgeist-log-remove-monitor"/> - <keyword type="function" name="zeitgeist_log_remove_monitor_finish ()" link="ZeitgeistLog.html#zeitgeist-log-remove-monitor-finish"/> <keyword type="function" name="zeitgeist_log_get_version ()" link="ZeitgeistLog.html#zeitgeist-log-get-version"/> <keyword type="function" name="zeitgeist_log_get_extensions ()" link="ZeitgeistLog.html#zeitgeist-log-get-extensions"/> <keyword type="function" name="zeitgeist_log_datapath ()" link="ZeitgeistLog.html#zeitgeist-log-datapath"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/xml/api-index-full.xml new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/xml/api-index-full.xml --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/xml/api-index-full.xml 2013-04-12 23:53:45.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/xml/api-index-full.xml 2013-06-18 04:44:38.000000000 +0200 @@ -181,7 +181,6 @@ <indexentry><primaryie linkends="zeitgeist-log-quit"><link linkend="zeitgeist-log-quit">zeitgeist_log_quit</link>, function in <link linkend="ZeitgeistLog">ZeitgeistLog</link></primaryie></indexentry> <indexentry><primaryie linkends="zeitgeist-log-quit-finish"><link linkend="zeitgeist-log-quit-finish">zeitgeist_log_quit_finish</link>, function in <link linkend="ZeitgeistLog">ZeitgeistLog</link></primaryie></indexentry> <indexentry><primaryie linkends="zeitgeist-log-remove-monitor"><link linkend="zeitgeist-log-remove-monitor">zeitgeist_log_remove_monitor</link>, function in <link linkend="ZeitgeistLog">ZeitgeistLog</link></primaryie></indexentry> -<indexentry><primaryie linkends="zeitgeist-log-remove-monitor-finish"><link linkend="zeitgeist-log-remove-monitor-finish">zeitgeist_log_remove_monitor_finish</link>, function in <link linkend="ZeitgeistLog">ZeitgeistLog</link></primaryie></indexentry> <indexentry><primaryie linkends="zeitgeist-manifestation-for-uri"><link linkend="zeitgeist-manifestation-for-uri">zeitgeist_manifestation_for_uri</link>, function in <link linkend="zeitgeist-2.0-mimetype">mimetype</link></primaryie></indexentry> <indexentry><primaryie linkends="zeitgeist-monitor-get-event-templates"><link linkend="zeitgeist-monitor-get-event-templates">zeitgeist_monitor_get_event_templates</link>, function in <link linkend="ZeitgeistMonitor">ZeitgeistMonitor</link></primaryie></indexentry> <indexentry><primaryie linkends="zeitgeist-monitor-get-path"><link linkend="zeitgeist-monitor-get-path">zeitgeist_monitor_get_path</link>, function in <link linkend="ZeitgeistMonitor">ZeitgeistMonitor</link></primaryie></indexentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/xml/log.xml new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/xml/log.xml --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/xml/log.xml 2013-04-12 23:53:45.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/xml/log.xml 2013-06-18 04:44:38.000000000 +0200 @@ -112,10 +112,6 @@ <parameter><link linkend="GError"><type>GError</type></link> **error</parameter>); <link linkend="void"><returnvalue>void</returnvalue></link> <link linkend="zeitgeist-log-remove-monitor">zeitgeist_log_remove_monitor</link> (<parameter><link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> *self</parameter>, <parameter><link linkend="ZeitgeistMonitor"><type>ZeitgeistMonitor</type></link> *monitor</parameter>, - <parameter><link linkend="GAsyncReadyCallback"><type>GAsyncReadyCallback</type></link> _callback_</parameter>, - <parameter><link linkend="gpointer"><type>gpointer</type></link> _user_data_</parameter>); -<link linkend="void"><returnvalue>void</returnvalue></link> <link linkend="zeitgeist-log-remove-monitor-finish">zeitgeist_log_remove_monitor_finish</link> (<parameter><link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> *self</parameter>, - <parameter><link linkend="GAsyncResult"><type>GAsyncResult</type></link> *_res_</parameter>, <parameter><link linkend="GError"><type>GError</type></link> **error</parameter>); <link linkend="void"><returnvalue>void</returnvalue></link> <link linkend="zeitgeist-log-get-version">zeitgeist_log_get_version</link> (<parameter><link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> *self</parameter>, <parameter><link linkend="gint"><type>gint</type></link> *major</parameter>, @@ -627,39 +623,14 @@ <indexterm zone="zeitgeist-log-remove-monitor"><primary>zeitgeist_log_remove_monitor</primary></indexterm> <programlisting><link linkend="void"><returnvalue>void</returnvalue></link> zeitgeist_log_remove_monitor (<parameter><link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> *self</parameter>, <parameter><link linkend="ZeitgeistMonitor"><type>ZeitgeistMonitor</type></link> *monitor</parameter>, - <parameter><link linkend="GAsyncReadyCallback"><type>GAsyncReadyCallback</type></link> _callback_</parameter>, - <parameter><link linkend="gpointer"><type>gpointer</type></link> _user_data_</parameter>);</programlisting> + <parameter><link linkend="GError"><type>GError</type></link> **error</parameter>);</programlisting> <para> Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged. -</para> -<para> -<emphasis>See also</emphasis>: <link linkend="zeitgeist-log-remove-monitor-finish"><function><link linkend="zeitgeist-log-remove-monitor-finish"><function>zeitgeist_log_remove_monitor_finish()</function></link></function></link> </para><variablelist role="params"> <varlistentry><term><parameter>self</parameter> :</term> <listitem><simpara>the <link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> instance</simpara></listitem></varlistentry> <varlistentry><term><parameter>monitor</parameter> :</term> <listitem><simpara> . A <link linkend="ZeitgeistMonitor"><type>ZeitgeistMonitor</type></link> to report back inserts and deletes. <emphasis role="annotation">[<acronym>in</acronym>][<acronym>transfer full</acronym>]</emphasis></simpara></listitem></varlistentry> -<varlistentry><term><parameter>_callback_</parameter> :</term> -<listitem><simpara>callback to call when the request is satisfied. <emphasis role="annotation">[<acronym>scope async</acronym>]</emphasis></simpara></listitem></varlistentry> -<varlistentry><term><parameter>_user_data_</parameter> :</term> -<listitem><simpara>the data to pass to <parameter>_callback_</parameter> function. <emphasis role="annotation">[<acronym>closure</acronym>]</emphasis></simpara></listitem></varlistentry> -</variablelist></refsect2> -<refsect2 id="zeitgeist-log-remove-monitor-finish" role="function"> -<title>zeitgeist_log_remove_monitor_finish ()</title> -<indexterm zone="zeitgeist-log-remove-monitor-finish"><primary>zeitgeist_log_remove_monitor_finish</primary></indexterm> -<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> zeitgeist_log_remove_monitor_finish (<parameter><link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> *self</parameter>, - <parameter><link linkend="GAsyncResult"><type>GAsyncResult</type></link> *_res_</parameter>, - <parameter><link linkend="GError"><type>GError</type></link> **error</parameter>);</programlisting> -<para> -Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged. -</para> -<para> -<emphasis>See also</emphasis>: <link linkend="zeitgeist-log-remove-monitor"><function><link linkend="zeitgeist-log-remove-monitor"><function>zeitgeist_log_remove_monitor()</function></link></function></link> -</para><variablelist role="params"> -<varlistentry><term><parameter>self</parameter> :</term> -<listitem><simpara>the <link linkend="ZeitgeistLog"><type>ZeitgeistLog</type></link> instance</simpara></listitem></varlistentry> -<varlistentry><term><parameter>_res_</parameter> :</term> -<listitem><simpara>a <link linkend="GAsyncResult"><type>GAsyncResult</type></link></simpara></listitem></varlistentry> <varlistentry><term><parameter>error</parameter> :</term> <listitem><simpara>location to store the error occuring, or <link linkend="NULL:CAPS"><literal>NULL</literal></link> to ignore</simpara></listitem></varlistentry> </variablelist></refsect2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl-list.txt new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl-list.txt --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl-list.txt 2013-04-12 23:53:45.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl-list.txt 2013-06-18 04:44:37.000000000 +0200 @@ -75,7 +75,6 @@ zeitgeist_log_quit zeitgeist_log_quit_finish zeitgeist_log_remove_monitor -zeitgeist_log_remove_monitor_finish zeitgeist_monitor_construct zeitgeist_monitor_get_event_templates zeitgeist_monitor_get_path diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl.txt new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl.txt --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl.txt 2013-04-12 23:53:45.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-decl.txt 2013-06-18 04:44:37.000000000 +0200 @@ -2263,12 +2263,7 @@ <FUNCTION> <NAME>zeitgeist_log_remove_monitor</NAME> <RETURNS>void </RETURNS> -ZeitgeistLog* self, ZeitgeistMonitor* monitor, GAsyncReadyCallback _callback_, gpointer _user_data_ -</FUNCTION> -<FUNCTION> -<NAME>zeitgeist_log_remove_monitor_finish</NAME> -<RETURNS>void </RETURNS> -ZeitgeistLog* self, GAsyncResult* _res_, GError** error +ZeitgeistLog* self, ZeitgeistMonitor* monitor, GError** error </FUNCTION> <FUNCTION> <NAME>zeitgeist_log_get_version</NAME> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-sections.txt new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-sections.txt --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-sections.txt 2013-04-12 23:53:45.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-sections.txt 2013-06-18 04:44:37.000000000 +0200 @@ -429,7 +429,6 @@ zeitgeist_log_quit_finish zeitgeist_log_install_monitor zeitgeist_log_remove_monitor -zeitgeist_log_remove_monitor_finish zeitgeist_log_get_version zeitgeist_log_get_extensions zeitgeist_log_datapath diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-undocumented.txt new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-undocumented.txt --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_c/zeitgeist-2.0-undocumented.txt 2013-04-12 23:53:45.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_c/zeitgeist-2.0-undocumented.txt 2013-06-18 04:44:38.000000000 +0200 @@ -1,5 +1,5 @@ 78% symbol docs coverage. -371 symbols documented. +370 symbols documented. 16 symbols incomplete. 106 not documented. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.html --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.html 2013-04-12 23:53:43.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.html 2013-06-18 04:44:35.000000000 +0200 @@ -164,7 +164,7 @@ matching event_templates are logged. The matching is done exactly as in the find_* family of methods and in Event.matches_template. Furthermore matched events must also have timestamps lying in time_range.</span> </div></li> - <li class="method"><span class="leaf_code_definition"><span class="main_keyword">public</span> <span class="main_keyword">async</span> <span class="main_keyword">void</span> <b><a href="Zeitgeist.Log.remove_monitor.html" class="method">remove_monitor</a></b> (<span class="main_keyword">owned</span> <span class="main_type"><a href="Zeitgeist.Monitor.html" class="class">Monitor</a></span> monitor) <span class="main_keyword">throws</span> <span class="main_type"><code>Error</code></span> + <li class="method"><span class="leaf_code_definition"><span class="main_keyword">public</span> <span class="main_keyword">void</span> <b><a href="Zeitgeist.Log.remove_monitor.html" class="method">remove_monitor</a></b> (<span class="main_keyword">owned</span> <span class="main_type"><a href="Zeitgeist.Monitor.html" class="class">Monitor</a></span> monitor) <span class="main_keyword">throws</span> <span class="main_type"><code>Error</code></span> </span> <div class="leaf_brief_description"><span class="brief_description">Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged.</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.remove_monitor.html new/zeitgeist-0.9.14/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.remove_monitor.html --- old/zeitgeist-0.9.12/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.remove_monitor.html 2013-04-12 23:53:43.000000000 +0200 +++ new/zeitgeist-0.9.14/doc/libzeitgeist/docs_vala/zeitgeist-2.0/Zeitgeist.Log.remove_monitor.html 2013-06-18 04:44:35.000000000 +0200 @@ -51,7 +51,7 @@ <h1 class="main_title">remove_monitor</h1> <hr class="main_hr"/> <h2 class="main_title">Description:</h2> - <div class="main_code_definition"><span class="main_keyword">public</span> <span class="main_keyword">async</span> <span class="main_keyword">void</span> <b><span css="method">remove_monitor</span></b> (<span class="main_keyword">owned</span> <span class="main_type"><a href="Zeitgeist.Monitor.html" class="class">Monitor</a></span> monitor) <span class="main_keyword">throws</span> <span class="main_type"><code>Error</code></span> + <div class="main_code_definition"><span class="main_keyword">public</span> <span class="main_keyword">void</span> <b><span css="method">remove_monitor</span></b> (<span class="main_keyword">owned</span> <span class="main_type"><a href="Zeitgeist.Monitor.html" class="class">Monitor</a></span> monitor) <span class="main_keyword">throws</span> <span class="main_type"><code>Error</code></span> </div> <div class="description"> <p>Remove a monitor from Zeitgeist engine that calls back when events matching event_templates are logged.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/examples/vala/monitor-events.c new/zeitgeist-0.9.14/examples/vala/monitor-events.c --- old/zeitgeist-0.9.12/examples/vala/monitor-events.c 2013-04-12 23:53:38.000000000 +0200 +++ new/zeitgeist-0.9.14/examples/vala/monitor-events.c 2013-06-17 08:42:42.000000000 +0200 @@ -8,15 +8,26 @@ #include "zeitgeist.h" #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +typedef struct _Block1Data Block1Data; #define _g_ptr_array_unref0(var) ((var == NULL) ? NULL : (var = (g_ptr_array_unref (var), NULL))) #define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL))) +struct _Block1Data { + int _ref_count_; + ZeitgeistMonitor* monitor; + ZeitgeistLog* log; +}; + void on_events_inserted (ZeitgeistTimeRange* tr, ZeitgeistResultSet* events); gint _vala_main (void); +static Block1Data* block1_data_ref (Block1Data* _data1_); +static void block1_data_unref (void * _userdata_); static void _g_object_unref0_ (gpointer var); static void _on_events_inserted_zeitgeist_monitor_events_inserted (ZeitgeistMonitor* _sender, ZeitgeistTimeRange* time_range, ZeitgeistResultSet* events, gpointer self); +static gboolean __lambda2_ (Block1Data* _data1_); +static gboolean ___lambda2__gsource_func (gpointer self); static gpointer _g_object_ref0 (gpointer self) { @@ -108,6 +119,23 @@ } +static Block1Data* block1_data_ref (Block1Data* _data1_) { + g_atomic_int_inc (&_data1_->_ref_count_); + return _data1_; +} + + +static void block1_data_unref (void * _userdata_) { + Block1Data* _data1_; + _data1_ = (Block1Data*) _userdata_; + if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { + _g_object_unref0 (_data1_->log); + _g_object_unref0 (_data1_->monitor); + g_slice_free (Block1Data, _data1_); + } +} + + static void _g_object_unref0_ (gpointer var) { (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); } @@ -123,8 +151,32 @@ } +static gboolean __lambda2_ (Block1Data* _data1_) { + gboolean result = FALSE; + ZeitgeistMonitor* _tmp0_; + GError * _inner_error_ = NULL; + _tmp0_ = _g_object_ref0 (_data1_->monitor); + zeitgeist_log_remove_monitor (_data1_->log, _tmp0_, &_inner_error_); + if (_inner_error_ != NULL) { + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return FALSE; + } + result = FALSE; + return result; +} + + +static gboolean ___lambda2__gsource_func (gpointer self) { + gboolean result; + result = __lambda2_ (self); + return result; +} + + gint _vala_main (void) { gint result = 0; + Block1Data* _data1_; GMainLoop* _tmp0_; GMainLoop* loop; ZeitgeistTimeRange* _tmp1_; @@ -133,10 +185,10 @@ GPtrArray* template; GPtrArray* _tmp3_; ZeitgeistMonitor* _tmp4_; - ZeitgeistMonitor* monitor; ZeitgeistLog* _tmp5_; - ZeitgeistLog* log; GError * _inner_error_ = NULL; + _data1_ = g_slice_new0 (Block1Data); + _data1_->_ref_count_ = 1; _tmp0_ = g_main_loop_new (NULL, FALSE); loop = _tmp0_; _tmp1_ = zeitgeist_time_range_new_anytime (); @@ -145,28 +197,29 @@ template = _tmp2_; _tmp3_ = _g_ptr_array_ref0 (template); _tmp4_ = zeitgeist_monitor_new (time_range, _tmp3_); - monitor = _tmp4_; + _data1_->monitor = _tmp4_; _tmp5_ = zeitgeist_log_new (); - log = _tmp5_; - g_signal_connect (monitor, "events-inserted", (GCallback) _on_events_inserted_zeitgeist_monitor_events_inserted, NULL); - zeitgeist_log_install_monitor (log, monitor, &_inner_error_); + _data1_->log = _tmp5_; + g_signal_connect (_data1_->monitor, "events-inserted", (GCallback) _on_events_inserted_zeitgeist_monitor_events_inserted, NULL); + zeitgeist_log_install_monitor (_data1_->log, _data1_->monitor, &_inner_error_); if (_inner_error_ != NULL) { - _g_object_unref0 (log); - _g_object_unref0 (monitor); _g_ptr_array_unref0 (template); _g_object_unref0 (time_range); _g_main_loop_unref0 (loop); + block1_data_unref (_data1_); + _data1_ = NULL; g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); return 0; } + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 2000, ___lambda2__gsource_func, block1_data_ref (_data1_), block1_data_unref); g_main_loop_run (loop); result = 0; - _g_object_unref0 (log); - _g_object_unref0 (monitor); _g_ptr_array_unref0 (template); _g_object_unref0 (time_range); _g_main_loop_unref0 (loop); + block1_data_unref (_data1_); + _data1_ = NULL; return result; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/examples/vala/monitor-events.vala new/zeitgeist-0.9.14/examples/vala/monitor-events.vala --- old/zeitgeist-0.9.12/examples/vala/monitor-events.vala 2013-03-19 07:01:48.000000000 +0100 +++ new/zeitgeist-0.9.14/examples/vala/monitor-events.vala 2013-06-17 08:40:08.000000000 +0200 @@ -26,6 +26,11 @@ //monitor.events_deleted.connect (on_events_deleted); log.install_monitor (monitor); + Timeout.add (2000, () => + { + log.remove_monitor (monitor); + return false; + }); loop.run (); return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/extensions/fts++/indexer.cpp new/zeitgeist-0.9.14/extensions/fts++/indexer.cpp --- old/zeitgeist-0.9.12/extensions/fts++/indexer.cpp 2013-03-19 07:01:48.000000000 +0100 +++ new/zeitgeist-0.9.14/extensions/fts++/indexer.cpp 2013-06-17 08:40:08.000000000 +0200 @@ -1081,6 +1081,7 @@ } } + g_ptr_array_set_free_func (results, g_object_unref); g_ptr_array_unref (results); // construct custom where clause which combines the original template @@ -1234,6 +1235,8 @@ ZEITGEIST_ENGINE_ERROR, ZEITGEIST_ENGINE_ERROR_DATABASE_ERROR, "Internal database error"); + g_ptr_array_set_free_func (results, g_object_unref); + g_ptr_array_unref (results); return NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/extensions/fts++/zeitgeist-fts.vala new/zeitgeist-0.9.14/extensions/fts++/zeitgeist-fts.vala --- old/zeitgeist-0.9.12/extensions/fts++/zeitgeist-fts.vala 2013-03-19 07:01:48.000000000 +0100 +++ new/zeitgeist-0.9.14/extensions/fts++/zeitgeist-fts.vala 2013-06-17 08:40:08.000000000 +0200 @@ -66,6 +66,7 @@ public FtsDaemon () throws EngineError { engine = new DbReader (); + engine.database.set_cache_size (16); indexer = new Indexer (engine); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/libzeitgeist/db-reader.vala new/zeitgeist-0.9.14/libzeitgeist/db-reader.vala --- old/zeitgeist-0.9.12/libzeitgeist/db-reader.vala 2013-04-12 12:45:03.000000000 +0200 +++ new/zeitgeist-0.9.14/libzeitgeist/db-reader.vala 2013-06-17 08:40:08.000000000 +0200 @@ -67,6 +67,8 @@ // FIXME: propagate this properly? critical ("TableLookup initialization failed: %s", err.message); } + + database.set_cache_size (128); } protected Event get_event_from_row (Sqlite.Statement stmt, uint32 event_id) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/libzeitgeist/log.vala new/zeitgeist-0.9.14/libzeitgeist/log.vala --- old/zeitgeist-0.9.12/libzeitgeist/log.vala 2013-04-12 12:45:03.000000000 +0200 +++ new/zeitgeist-0.9.14/libzeitgeist/log.vala 2013-06-17 08:40:08.000000000 +0200 @@ -166,6 +166,12 @@ protected override void on_connection_lost () { + // Reset the monitor's registration id (0 = not registered) + foreach (unowned Monitor monitor in monitors.get_keys ()) + { + monitors.replace (monitor, 0); + } + dbreader = null; } @@ -546,7 +552,7 @@ { uint registration_id = conn.register_object<RemoteMonitor> ( monitor.get_path (), monitor); - monitors.insert (monitor, registration_id); + monitors.replace (monitor, registration_id); } catch (GLib.IOError err) { @@ -566,13 +572,11 @@ * * @param monitor A {@link Monitor} to report back inserts and deletes */ - public async void remove_monitor (owned Monitor monitor) throws Error + public void remove_monitor (owned Monitor monitor) throws Error { - yield wait_for_proxy (); - try { - yield proxy.remove_monitor (monitor.get_path ()); + proxy.remove_monitor.begin (monitor.get_path ()); } catch (IOError err) { @@ -588,6 +592,8 @@ var connection = ((DBusProxy) proxy).get_connection (); connection.unregister_object (registration_id); } + + monitors.remove (monitor); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/libzeitgeist/sql-schema.vala new/zeitgeist-0.9.14/libzeitgeist/sql-schema.vala --- old/zeitgeist-0.9.12/libzeitgeist/sql-schema.vala 2013-03-19 07:01:48.000000000 +0100 +++ new/zeitgeist-0.9.14/libzeitgeist/sql-schema.vala 2013-06-17 08:40:08.000000000 +0200 @@ -5,6 +5,7 @@ * Copyright © 2011-2012 Canonical Ltd. * By Michal Hruby <[email protected]> * By Siegfried-A. Gevatter <[email protected]> + * Copyright © 2013 Seif Lotfy <[email protected]> * * Based upon a Python implementation (2009-2011) by: * Markus Korn <[email protected]> @@ -36,7 +37,7 @@ { public const string CORE_SCHEMA = "core"; - public const int CORE_SCHEMA_VERSION = 9; + public const int CORE_SCHEMA_VERSION = 10; private const string DATABASE_CREATION = "database_creation"; @@ -59,7 +60,7 @@ Timestamp.from_now ()); exec_query (database, schema_sql); } - else if (schema_version >= 3 && schema_version <= 8) + else if (schema_version >= 3 && schema_version <= 9) { backup_database (); @@ -271,6 +272,8 @@ exec_query (database, "PRAGMA journal_mode = WAL"); exec_query (database, "PRAGMA synchronous = NORMAL"); exec_query (database, "PRAGMA locking_mode = NORMAL"); + exec_query (database, "PRAGMA default_cache_size = 50"); + exec_query (database, "PRAGMA wal_autocheckpoint = 10"); } public static void create_schema (Sqlite.Database database) @@ -649,7 +652,7 @@ * @param database the database on which to run the query * @param sql the SQL query to run */ - private static void exec_query (Sqlite.Database database, + public static void exec_query (Sqlite.Database database, string sql) throws EngineError { int rc = database.exec (sql); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/libzeitgeist/sql.vala new/zeitgeist-0.9.14/libzeitgeist/sql.vala --- old/zeitgeist-0.9.12/libzeitgeist/sql.vala 2013-03-19 07:01:48.000000000 +0100 +++ new/zeitgeist-0.9.14/libzeitgeist/sql.vala 2013-06-17 08:40:08.000000000 +0200 @@ -452,6 +452,11 @@ return false; } + public void set_cache_size (int size) { + DatabaseSchema.exec_query (database, + "PRAGMA cache_size = %i".printf (size)); + } + protected void update_callback (Sqlite.Action action, string dbname, string table, int64 rowid) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.9.12/src/engine.vala new/zeitgeist-0.9.14/src/engine.vala --- old/zeitgeist-0.9.12/src/engine.vala 2013-03-19 07:01:48.000000000 +0100 +++ new/zeitgeist-0.9.14/src/engine.vala 2013-06-17 08:40:08.000000000 +0200 @@ -63,6 +63,7 @@ construct { extension_store = new ExtensionStore (this); + database.set_cache_size (24); } public string[] get_extension_names () @@ -292,23 +293,19 @@ int rc; unowned Sqlite.Statement insert_stmt = database.event_insertion_stmt; - // We need to call reset here (even if we do so again in the subjects - // loop) since calling .bind_* after a .step() invocation is illegal. - insert_stmt.reset (); - - insert_stmt.bind_int64 (1, event.id); - insert_stmt.bind_int64 (2, event.timestamp); - bind_cached_reference (insert_stmt, 3, interpretations_table, - event.interpretation); - bind_cached_reference (insert_stmt, 4, manifestations_table, - event.manifestation); - bind_cached_reference (insert_stmt, 5, actors_table, event.actor); - insert_stmt.bind_text (6, event.origin); - insert_stmt.bind_int64 (7, payload_id); - - for (int i = 0; i < event.num_subjects(); ++i) + for (int i = 0; i < event.num_subjects (); ++i) { - insert_stmt.reset(); + insert_stmt.reset (); + + insert_stmt.bind_int64 (1, event.id); + insert_stmt.bind_int64 (2, event.timestamp); + bind_cached_reference (insert_stmt, 3, interpretations_table, + event.interpretation); + bind_cached_reference (insert_stmt, 4, manifestations_table, + event.manifestation); + bind_cached_reference (insert_stmt, 5, actors_table, event.actor); + insert_stmt.bind_text (6, event.origin); + insert_stmt.bind_int64 (7, payload_id); unowned Subject subject = event.subjects[i]; @@ -326,7 +323,7 @@ // FIXME: Consider a storages_table table. Too dangerous? insert_stmt.bind_text (16, subject.storage); - if ((rc = insert_stmt.step()) != Sqlite.DONE) { + if ((rc = insert_stmt.step ()) != Sqlite.DONE) { if (rc != Sqlite.CONSTRAINT) { database.assert_not_corrupt (rc); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
