diff -Nru dee-1.0.4/aclocal.m4 dee-1.0.6/aclocal.m4 --- dee-1.0.4/aclocal.m4 2012-02-17 10:11:53.000000000 +0000 +++ dee-1.0.6/aclocal.m4 2012-03-12 08:20:52.000000000 +0000 @@ -131,6 +131,8 @@ ],dnl [auto],[dnl PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection ],dnl [dnl AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) diff -Nru dee-1.0.4/configure dee-1.0.6/configure --- dee-1.0.4/configure 2012-02-17 10:11:56.000000000 +0000 +++ dee-1.0.6/configure 2012-03-12 08:20:55.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for dee 1.0.4. +# Generated by GNU Autoconf 2.68 for dee 1.0.6. # # Report bugs to . # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='dee' PACKAGE_TARNAME='dee' -PACKAGE_VERSION='1.0.4' -PACKAGE_STRING='dee 1.0.4' +PACKAGE_VERSION='1.0.6' +PACKAGE_STRING='dee 1.0.6' PACKAGE_BUGREPORT='https://bugs.launchpad.net/dee' PACKAGE_URL='' @@ -1378,7 +1378,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 dee 1.0.4 to adapt to many kinds of systems. +\`configure' configures dee 1.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1448,7 +1448,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dee 1.0.4:";; + short | recursive ) echo "Configuration of dee 1.0.6:";; esac cat <<\_ACEOF @@ -1581,7 +1581,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dee configure 1.0.4 +dee configure 1.0.6 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1950,7 +1950,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dee $as_me 1.0.4, which was +It was created by dee $as_me 1.0.6, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2774,7 +2774,7 @@ # Define the identity of the package. PACKAGE='dee' - VERSION='1.0.4' + VERSION='1.0.6' cat >>confdefs.h <<_ACEOF @@ -3031,8 +3031,8 @@ DEE_MAJOR_VERSION=1 DEE_MINOR_VERSION=0 -DEE_MICRO_VERSION=4 -DEE_VERSION=1.0.4 +DEE_MICRO_VERSION=6 +DEE_VERSION=1.0.6 @@ -12585,6 +12585,7 @@ else found_introspection=no fi + enable_introspection=$found_introspection ;; #( *) : as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 @@ -13865,7 +13866,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dee $as_me 1.0.4, which was +This file was extended by dee $as_me 1.0.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13931,7 +13932,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dee config.status 1.0.4 +dee config.status 1.0.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -16297,7 +16298,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dee $as_me 1.0.4, which was +This file was extended by dee $as_me 1.0.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16363,7 +16364,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dee config.status 1.0.4 +dee config.status 1.0.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru dee-1.0.4/configure.ac dee-1.0.6/configure.ac --- dee-1.0.4/configure.ac 2012-02-17 10:11:36.000000000 +0000 +++ dee-1.0.6/configure.ac 2012-03-12 08:20:37.000000000 +0000 @@ -5,7 +5,7 @@ # Don't forget that this changes also GIR version, and requires rebuilding vapi m4_define([dee_major], [1]) m4_define([dee_minor], [0]) -m4_define([dee_micro], [4]) +m4_define([dee_micro], [6]) m4_define([dee_api], [dee_major.dee_minor]) m4_define([dee_version], diff -Nru dee-1.0.4/debian/changelog dee-1.0.6/debian/changelog --- dee-1.0.4/debian/changelog 2012-03-12 11:01:41.000000000 +0000 +++ dee-1.0.6/debian/changelog 2012-03-12 11:01:41.000000000 +0000 @@ -1,3 +1,16 @@ +dee (1.0.6-0ubuntu1) precise; urgency=low + + * New upstream release. + - Provide a way to have a ReadOnly model (LP: #675565) + - Prefix search with DeeTreeIndex doesn't return correct results + (LP: #933111) + - Doing multiple changes with clear in one transaction causes critical + (LP: #940419) + * debian/libdee-1.0-4.symbols: + - updated + + -- Didier Roche Mon, 12 Mar 2012 11:49:53 +0100 + dee (1.0.4-0ubuntu1) precise; urgency=low * New upstream release. diff -Nru dee-1.0.4/debian/libdee-1.0-4.symbols dee-1.0.6/debian/libdee-1.0-4.symbols --- dee-1.0.4/debian/libdee-1.0-4.symbols 2012-03-12 11:01:41.000000000 +0000 +++ dee-1.0.6/debian/libdee-1.0-4.symbols 2012-03-12 11:01:41.000000000 +0000 @@ -109,6 +109,7 @@ dee_model_set_value@Base 0.5.2 dee_peer_get_connections@Base 1.0.0 dee_peer_get_swarm_leader@Base 0.5.2 + dee_peer_is_swarm_owner@Base 1.0.6 dee_peer_get_swarm_name@Base 0.5.2 dee_peer_get_type@Base 0.5.2 dee_peer_is_swarm_leader@Base 0.5.2 @@ -144,6 +145,7 @@ dee_server_get_type@Base 1.0.0 dee_server_new@Base 1.0.0 dee_server_new_for_address@Base 1.0.0 + dee_shared_model_access_mode_get_type@Base 1.0.6 dee_shared_model_flush_revision_queue@Base 0.5.12 dee_shared_model_get_peer@Base 0.5.2 dee_shared_model_get_swarm_name@Base 0.5.2 diff -Nru dee-1.0.4/doc/reference/dee-1.0/dee-1.0-sections.txt dee-1.0.6/doc/reference/dee-1.0/dee-1.0-sections.txt --- dee-1.0.4/doc/reference/dee-1.0/dee-1.0-sections.txt 2012-02-17 10:12:40.000000000 +0000 +++ dee-1.0.6/doc/reference/dee-1.0/dee-1.0-sections.txt 2012-03-12 08:21:22.000000000 +0000 @@ -39,24 +39,6 @@
-dee-client -DeeClient -DeeClient -DeeClientClass -dee_client_new -dee_client_new_for_address - -DEE_CLIENT -DEE_CLIENT_CLASS -DEE_CLIENT_GET_CLASS -DEE_IS_CLIENT -DEE_IS_CLIENT_CLASS -DEE_TYPE_CLIENT -DeeClientPrivate -dee_client_get_type -
- -
dee-file-resource-manager DeeFileResourceManager DeeFileResourceManager @@ -87,7 +69,6 @@ dee_filter_new_for_any_column dee_filter_new_for_key_column dee_filter_new_regex -dee_filter_new_sort dee_filter_notify
@@ -149,18 +130,6 @@
-dee-icu -DEE_ICU_ERROR -DeeICUError -DeeICUTermFilter -dee_icu_error_quark -dee_icu_term_filter_apply -dee_icu_term_filter_destroy -dee_icu_term_filter_new -dee_icu_term_filter_new_ascii_folder -
- -
dee-index DeeIndex DeeIndex @@ -196,18 +165,17 @@
dee-model DeeModel -DeeCompareRowFunc DeeModel DeeModelIface DeeModelIter DeeModelTag dee_model_append dee_model_append_row +dee_model_append_valist dee_model_build_row +dee_model_build_row_valist dee_model_clear dee_model_clear_tag -dee_model_find_row_sorted -dee_model_find_sorted dee_model_get dee_model_get_bool dee_model_get_column_schema @@ -227,18 +195,20 @@ dee_model_get_uchar dee_model_get_uint32 dee_model_get_uint64 +dee_model_get_valist dee_model_get_value dee_model_insert dee_model_insert_before +dee_model_insert_before_valist dee_model_insert_row dee_model_insert_row_before -dee_model_insert_row_sorted -dee_model_insert_sorted +dee_model_insert_valist dee_model_is_first dee_model_is_last dee_model_next dee_model_prepend dee_model_prepend_row +dee_model_prepend_valist dee_model_prev dee_model_register_tag dee_model_remove @@ -246,16 +216,16 @@ dee_model_set_row dee_model_set_schema dee_model_set_schema_full +dee_model_set_schema_valist dee_model_set_tag +dee_model_set_valist dee_model_set_value DEE_IS_MODEL DEE_MODEL DEE_MODEL_GET_IFACE DEE_TYPE_MODEL -DEE_TYPE_MODEL_ITER dee_model_get_type -dee_model_iter_get_type
@@ -277,11 +247,9 @@ DEE_PEER_DBUS_IFACE DeePeer DeePeerClass -dee_peer_get_connections dee_peer_get_swarm_leader dee_peer_get_swarm_name dee_peer_is_swarm_leader -dee_peer_list_peers dee_peer_new DEE_IS_PEER @@ -403,26 +371,6 @@
-dee-server -DeeServer -DeeServer -DeeServerClass -dee_server_bus_address_for_name -dee_server_get_client_address -dee_server_new -dee_server_new_for_address - -DEE_IS_SERVER -DEE_IS_SERVER_CLASS -DEE_SERVER -DEE_SERVER_CLASS -DEE_SERVER_GET_CLASS -DEE_TYPE_SERVER -DeeServerPrivate -dee_server_get_type -
- -
dee-shared-model DeeSharedModel DEE_SHARED_MODEL_DBUS_IFACE @@ -435,7 +383,6 @@ dee_shared_model_is_leader dee_shared_model_is_synchronized dee_shared_model_new -dee_shared_model_new_for_peer dee_shared_model_new_with_back_end DEE_IS_SHARED_MODEL diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/annotation-glossary.html dee-1.0.6/doc/reference/dee-1.0/html/annotation-glossary.html --- dee-1.0.4/doc/reference/dee-1.0/html/annotation-glossary.html 2012-02-17 10:12:40.000000000 +0000 +++ dee-1.0.6/doc/reference/dee-1.0/html/annotation-glossary.html 2012-03-12 08:21:22.000000000 +0000 @@ -41,8 +41,6 @@ T  |  S -  |  - E
@@ -78,27 +76,20 @@

Generics and defining elements of containers and arrays.

T

-transfer container
-

Free data container after the code is done.

+transfer full +

Free data after the code is done.

S

scope call

The callback is valid only during the call to the method.

T

-transfer full
-

Free data after the code is done.

-
type

Override the parsed C type with given type

S

scope notified

The callback is valid until the GDestroyNotify argument is called.

-

E

-
-error-domains
-

Typed errors. Similar to throws in Java.

diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/api-index-full.html dee-1.0.6/doc/reference/dee-1.0/html/api-index-full.html --- dee-1.0.4/doc/reference/dee-1.0/html/api-index-full.html 2012-02-17 10:12:40.000000000 +0000 +++ dee-1.0.6/doc/reference/dee-1.0/html/api-index-full.html 2012-03-12 08:21:22.000000000 +0000 @@ -86,33 +86,9 @@

C

-DeeClient, struct in DeeClient -
-
-
-DeeClient:bus-address, object property in DeeClient -
-
-
-DeeClientClass, struct in DeeClient -
-
-
-dee_client_new, function in DeeClient -
-
-
-dee_client_new_for_address, function in DeeClient -
-
-
DeeCollatorFunc, user_function in DeeAnalyzer
-
-DeeCompareRowFunc, user_function in DeeModel -
-

F

DeeFileResourceManager, struct in DeeFileResourceManager @@ -223,10 +199,6 @@
-dee_filter_new_sort, function in Filters -
-
-
dee_filter_notify, function in Filters
@@ -258,38 +230,6 @@

I

-DeeICUError, enum in Dee ICU Extensions -
-
-
-DeeICUTermFilter, struct in Dee ICU Extensions -
-
-
-DEE_ICU_ERROR, macro in Dee ICU Extensions -
-
-
-dee_icu_error_quark, function in Dee ICU Extensions -
-
-
-dee_icu_term_filter_apply, function in Dee ICU Extensions -
-
-
-dee_icu_term_filter_destroy, function in Dee ICU Extensions -
-
-
-dee_icu_term_filter_new, function in Dee ICU Extensions -
-
-
-dee_icu_term_filter_new_ascii_folder, function in Dee ICU Extensions -
-
-
DeeIndex, struct in DeeIndex
@@ -411,14 +351,6 @@
-dee_model_find_row_sorted, function in DeeModel -
-
-
-dee_model_find_sorted, function in DeeModel -
-
-
dee_model_get, function in DeeModel
@@ -515,14 +447,6 @@
-dee_model_insert_row_sorted, function in DeeModel -
-
-
-dee_model_insert_sorted, function in DeeModel -
-
-
dee_model_is_first, function in DeeModel
@@ -632,15 +556,15 @@
-DeePeerClass, struct in DeePeer +DeePeer:swarm-owner, object property in DeePeer
-DEE_PEER_DBUS_IFACE, macro in DeePeer +DeePeerClass, struct in DeePeer
-dee_peer_get_connections, function in DeePeer +DEE_PEER_DBUS_IFACE, macro in DeePeer
@@ -656,10 +580,6 @@
-dee_peer_list_peers, function in DeePeer -
-
-
dee_peer_new, function in DeePeer
@@ -806,38 +726,6 @@
-DeeServer, struct in DeeServer -
-
-
-DeeServer:bus-address, object property in DeeServer -
-
-
-DeeServer:same-user-only, object property in DeeServer -
-
-
-DeeServerClass, struct in DeeServer -
-
-
-dee_server_bus_address_for_name, function in DeeServer -
-
-
-dee_server_get_client_address, function in DeeServer -
-
-
-dee_server_new, function in DeeServer -
-
-
-dee_server_new_for_address, function in DeeServer -
-
-
DeeSharedModel, struct in DeeSharedModel
@@ -850,6 +738,10 @@
+DeeSharedModel:access-mode, object property in DeeSharedModel +
+
+
DeeSharedModel:peer, object property in DeeSharedModel
@@ -894,10 +786,6 @@
-dee_shared_model_new_for_peer, function in DeeSharedModel -
-
-
dee_shared_model_new_with_back_end, function in DeeSharedModel
diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/ch01.html dee-1.0.6/doc/reference/dee-1.0/html/ch01.html --- dee-1.0.4/doc/reference/dee-1.0/html/ch01.html 2012-02-17 10:12:40.000000000 +0000 +++ dee-1.0.6/doc/reference/dee-1.0/html/ch01.html 2012-03-12 08:21:22.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -17,23 +17,15 @@   Home Dee Reference Manual -Next +Next

-Peer Discovery

-
-
-DeeClient — Creates a client object you can use to connect - to a DeeServer. -
-
+Peer Discovery
+
DeePeer — Finds other objects with the same swarm-name on the bus. -
-
-DeeServer — Creates a server object you can connect to. -
-
+ +<xi:include></xi:include><xi:include></xi:include>
diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/ch02.html dee-1.0.6/doc/reference/dee-1.0/html/ch02.html --- dee-1.0.4/doc/reference/dee-1.0/html/ch02.html 2012-02-17 10:12:40.000000000 +0000 +++ dee-1.0.6/doc/reference/dee-1.0/html/ch02.html 2012-03-12 08:21:22.000000000 +0000 @@ -6,14 +6,14 @@ - + - + @@ -21,7 +21,7 @@

-Models

+Models
Filters — A suite of simple DeeFilters for use with DeeFilterModels diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/ch03.html dee-1.0.6/doc/reference/dee-1.0/html/ch03.html --- dee-1.0.4/doc/reference/dee-1.0/html/ch03.html 2012-02-17 10:12:40.000000000 +0000 +++ dee-1.0.6/doc/reference/dee-1.0/html/ch03.html 2012-03-12 08:21:22.000000000 +0000 @@ -21,7 +21,7 @@

-Indexes

+Indexes
DeeAnalyzer — Primary gateway for data indexing @@ -47,10 +47,8 @@
DeeTreeIndex — A DeeTreeIndex backed by a balanced binary tree
-
-Dee ICU Extensions — A suite of DeeTermFilters based on ICU -
+<xi:include></xi:include>
diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/ch04.html dee-1.0.6/doc/reference/dee-1.0/html/ch04.html --- dee-1.0.4/doc/reference/dee-1.0/html/ch04.html 2012-02-17 10:12:40.000000000 +0000 +++ dee-1.0.6/doc/reference/dee-1.0/html/ch04.html 2012-03-12 08:21:22.000000000 +0000 @@ -6,14 +6,14 @@ - + - + @@ -21,7 +21,7 @@

-Resources and Serialization

+Resources and Serialization
DeeFileResourceManager — A resource manager backed by memory mapped files diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/dee-1.0-Dee-ICU-Extensions.html dee-1.0.6/doc/reference/dee-1.0/html/dee-1.0-Dee-ICU-Extensions.html --- dee-1.0.4/doc/reference/dee-1.0/html/dee-1.0-Dee-ICU-Extensions.html 2012-02-17 10:12:40.000000000 +0000 +++ dee-1.0.6/doc/reference/dee-1.0/html/dee-1.0-Dee-ICU-Extensions.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,221 +0,0 @@ - - - - -Dee ICU Extensions - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

Dee ICU Extensions

-

Dee ICU Extensions — A suite of DeeTermFilters based on ICU

-
-
-

Synopsis

-
-#include <dee-icu.h>
-
-#define             DEE_ICU_ERROR
-enum                DeeICUError;
-                    DeeICUTermFilter;
-GQuark              dee_icu_error_quark                 (void);
-gchar *             dee_icu_term_filter_apply           (DeeICUTermFilter *self,
-                                                         const gchar *text);
-void                dee_icu_term_filter_destroy         (DeeICUTermFilter *filter);
-DeeICUTermFilter *  dee_icu_term_filter_new             (const gchar *system_id,
-                                                         const gchar *rules,
-                                                         GError **error);
-DeeICUTermFilter *  dee_icu_term_filter_new_ascii_folder
-                                                        ();
-
-
-
-

Description

-

-This module allows developers to easily construct powerful -DeeTermFilters with ease. The filters leverage the ICU -framework to provide world class transliteration features. -

-

-The filters can be employed manually by calling dee_icu_term_filter_apply() -or installed in a DeeAnalyzer by calling dee_analyzer_add_term_filter() -passing the term filter instance as the user data and -dee_icu_term_filter_destroy() as the GDestroyNotify. -

-
-
-

Details

-
-

DEE_ICU_ERROR

-
#define DEE_ICU_ERROR dee_icu_error_quark()
-
-

-Error domain for the ICU extension to Dee. Error codes will be from the -DeeICUError enumeration -

-
-
-
-

enum DeeICUError

-
typedef enum {
-  DEE_ICU_ERROR_BAD_RULE,
-  DEE_ICU_ERROR_BAD_ID,
-  DEE_ICU_ERROR_UNKNOWN
-} DeeICUError;
-
-

-Error codes for the ICU extension to Dee. These codes will be set when the -error domain is DEE_ICU_ERROR. -

-

-DEE_ICU_ERROR_BAD_RULE: Error parsing a transliteration rule -DEE_ICU_ERROR_BAD_ID: Error parsing a transliterator system id -DEE_ICU_ERROR_UNKNOWN: The ICU subsystem returned an error that is not - handled in Dee -

-
-
-
-

DeeICUTermFilter

-
typedef struct _DeeICUTermFilter DeeICUTermFilter;
-

-

-
-
-
-

dee_icu_error_quark ()

-
GQuark              dee_icu_error_quark                 (void);
-

-

-
-
-
-

dee_icu_term_filter_apply ()

-
gchar *             dee_icu_term_filter_apply           (DeeICUTermFilter *self,
-                                                         const gchar *text);
-

-Apply a DeeICUTermFilter on a piece of UTF-8 text. -

-
-- - - - - - - - - - - - - - -

self :

The filter to apply

text :

The text to apply the filter on

Returns :

A newly allocated string. Free with g_free(). [transfer full] -
-
-
-
-

dee_icu_term_filter_destroy ()

-
void                dee_icu_term_filter_destroy         (DeeICUTermFilter *filter);
-

-Free all resources allocated by a DeeICUTermFilter. -

-
-- - - - -

filter :

The filter to free
-
-
-
-

dee_icu_term_filter_new ()

-
DeeICUTermFilter *  dee_icu_term_filter_new             (const gchar *system_id,
-                                                         const gchar *rules,
-                                                         GError **error);
-

-Create a new DeeICUTermFilter for a given ICU transliterator system id -and/or set of transliteration rules. -

-
-- - - - - - - - - - - - - - - - - - -

system_id :

A system id for the transliterator to use. -See userguide.icu-project.org/transforms/general -

rules :

A set of transliteration rules to use. -See userguide.icu-project.org/transforms/general/rules. [allow-none] -

error :

A place to return a GError, or NULL to ignore errors. [allow-none][error-domains Dee.ICUError] -

Returns :

A newly allocated DeeICUTermFilter. -Free with dee_icu_term_filter_destroy(). [transfer full] -
-
-
-
-

dee_icu_term_filter_new_ascii_folder ()

-
DeeICUTermFilter *  dee_icu_term_filter_new_ascii_folder
-                                                        ();
-

-Construct a term filter that folds any UTF-8 string into ASCII. -

-
-- - - - -

Returns :

A newly allocated DeeICUTermFilter. Free with -dee_icu_term_filter_destroy(). [transfer full] -
-
-
-
-
-
- Generated by GTK-Doc V1.18
- - \ No newline at end of file diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/dee-1.0.devhelp2 dee-1.0.6/doc/reference/dee-1.0/html/dee-1.0.devhelp2 --- dee-1.0.4/doc/reference/dee-1.0/html/dee-1.0.devhelp2 2012-02-17 10:12:40.000000000 +0000 +++ dee-1.0.6/doc/reference/dee-1.0/html/dee-1.0.devhelp2 2012-03-12 08:21:22.000000000 +0000 @@ -3,9 +3,7 @@ - - @@ -26,7 +24,6 @@ - @@ -38,34 +35,20 @@ - - - - - - - + - - - - - - - - @@ -77,7 +60,6 @@ - @@ -93,7 +75,6 @@ - @@ -103,8 +84,6 @@ - - @@ -129,8 +108,6 @@ - - @@ -171,8 +148,8 @@ - + @@ -249,14 +226,6 @@ - - - - - - - - diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/dee-1.0-Filters.html dee-1.0.6/doc/reference/dee-1.0/html/dee-1.0-Filters.html --- dee-1.0.4/doc/reference/dee-1.0/html/dee-1.0-Filters.html 2012-02-17 10:12:40.000000000 +0000 +++ dee-1.0.6/doc/reference/dee-1.0/html/dee-1.0-Filters.html 2012-03-12 08:21:22.000000000 +0000 @@ -70,10 +70,6 @@ void dee_filter_new_regex (guint column, GRegex *regex, DeeFilter *out_filter); -void dee_filter_new_sort (DeeCompareRowFunc cmp_row, - gpointer cmp_user_data, - GDestroyNotify cmp_destroy, - DeeFilter *out_filter); gboolean dee_filter_notify (DeeFilter *filter, DeeModelIter *orig_iter, DeeModel *orig_model, @@ -491,45 +487,6 @@
-

dee_filter_new_sort ()

-
void                dee_filter_new_sort                 (DeeCompareRowFunc cmp_row,
-                                                         gpointer cmp_user_data,
-                                                         GDestroyNotify cmp_destroy,
-                                                         DeeFilter *out_filter);
-

-Create a new DeeFilter sorting a model according to a DeeCompareRowFunc. -

-
-- - - - - - - - - - - - - - - - - - -

cmp_row :

A DeeCompareRowFunc to use for sorting. [scope notified] -

cmp_user_data :

User data passed to cmp_row. [closure] -

cmp_destroy :

The GDestroyNotify to call on -cmp_user_data when disposing of the filter. [allow-none] -

out_filter :

A pointer to an uninitialized DeeFilter struct. -This struct will zeroed and configured with the filter -parameters. [out] -
-
-
-

dee_filter_notify ()

gboolean            dee_filter_notify                   (DeeFilter *filter,
                                                          DeeModelIter *orig_iter,
diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/DeeClient.html dee-1.0.6/doc/reference/dee-1.0/html/DeeClient.html
--- dee-1.0.4/doc/reference/dee-1.0/html/DeeClient.html	2012-02-17 10:12:40.000000000 +0000
+++ dee-1.0.6/doc/reference/dee-1.0/html/DeeClient.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,150 +0,0 @@
-
-
-
-
-DeeClient
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
DeeClient

-
DeeClient — Creates a client object you can use to connect
-                    to a DeeServer.

-

-

-
Synopsis

-
-#include <dee.h>
-
-                    DeeClient;
-                    DeeClientClass;
-DeeClient *         dee_client_new                      (const gchar *swarm_name);
-DeeClient *         dee_client_new_for_address          (const gchar *swarm_name,
-                                                         const gchar *bus_address);
-

-

-

-
Object Hierarchy

-
-  GObject
-   +----DeePeer
-         +----DeeClient
-

-

-

-
Properties

-
-  "bus-address"              gchar*                : Read / Write / Construct Only
-

-

-

-
Description

-

-DeeClient is the endpoint for connecting to DeeServer.
-

-

-

-
Details

-

-
DeeClient

-
typedef struct _DeeClient DeeClient;

-

-

-

-

-

-
DeeClientClass

-
typedef struct {
-} DeeClientClass;
-

-

-

-

-

-

-
dee_client_new ()

-
DeeClient *         dee_client_new                      (const gchar *swarm_name);

-

-swarm_name: Name of swarm to join.
-

-

-Creates a new instance of DeeClient and tries to connect to DeeServer
-created using dee_server_new(). The "swarm-leader" property will
-be set once the client connects.
-

-

--
-
-
-
-


Returns :
A newly constructed DeeClient. [transfer full]
-

-

-

-

-
dee_client_new_for_address ()

-
DeeClient *         dee_client_new_for_address          (const gchar *swarm_name,
-                                                         const gchar *bus_address);

-

-swarm_name: Name of swarm to join.
-bus_address: D-Bus address to use when connecting to the server.
-

-

-Creates a new instance of DeeClient and tries to connect to bus_address.
-The "swarm-leader" property will be set once the client connects.
-

-

--
-
-
-
-


Returns :
A newly constructed DeeClient. [transfer full]
-

-

-

-

-
Property Details

-

-
The "bus-address" property

-
  "bus-address"              gchar*                : Read / Write / Construct Only

-
Bus address to use for the connection.

-
Default value: NULL

-

-

-

-

-

-          Generated by GTK-Doc V1.18

-
-
\ No newline at end of file
diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/DeeModel.html dee-1.0.6/doc/reference/dee-1.0/html/DeeModel.html
--- dee-1.0.4/doc/reference/dee-1.0/html/DeeModel.html	2012-02-17 10:12:40.000000000 +0000
+++ dee-1.0.6/doc/reference/dee-1.0/html/DeeModel.html	2012-03-12 08:21:22.000000000 +0000
@@ -48,9 +48,6 @@
 
 #include <dee.h>
 
-gint                (*DeeCompareRowFunc)                (GVariant **row1,
-                                                         GVariant **row2,
-                                                         gpointer user_data);
                     DeeModel;
 struct              DeeModelIface;
                     DeeModelIter;
@@ -66,16 +63,6 @@
 void                dee_model_clear_tag                 (DeeModel *self,
                                                          DeeModelIter *iter,
                                                          DeeModelTag *tag);
-DeeModelIter *      dee_model_find_row_sorted           (DeeModel *self,
-                                                         GVariant **row_spec,
-                                                         DeeCompareRowFunc cmp_func,
-                                                         gpointer user_data,
-                                                         gboolean *out_was_found);
-DeeModelIter *      dee_model_find_sorted               (DeeModel *self,
-                                                         DeeCompareRowFunc cmp_func,
-                                                         gpointer user_data,
-                                                         gboolean *out_was_found,
-                                                         ...);
 void                dee_model_get                       (DeeModel *self,
                                                          DeeModelIter *iter,
                                                          ...);
@@ -136,14 +123,6 @@
 DeeModelIter *      dee_model_insert_row_before         (DeeModel *self,
                                                          DeeModelIter *iter,
                                                          GVariant **row_members);
-DeeModelIter *      dee_model_insert_row_sorted         (DeeModel *self,
-                                                         GVariant **row_members,
-                                                         DeeCompareRowFunc cmp_func,
-                                                         gpointer user_data);
-DeeModelIter *      dee_model_insert_sorted             (DeeModel *self,
-                                                         DeeCompareRowFunc cmp_func,
-                                                         gpointer user_data,
-                                                         ...);
 gboolean            dee_model_is_first                  (DeeModel *self,
                                                          DeeModelIter *iter);
 gboolean            dee_model_is_last                   (DeeModel *self,
@@ -241,8 +220,8 @@
 
Sorting

 

 As a simpler alternative to using indexes you can rely on sorted models.
-This is done by using the dee_model_insert_sorted() and
-dee_model_find_sorted() family of APIs. Some model classes have 
+This is done by using the dee_model_insert_sorted() and
+dee_model_find_sorted() family of APIs. Some model classes have 
 accelerated implementations of sorted inserts and lookups.
 Notably DeeSequenceModel.
 

@@ -272,40 +251,6 @@
 

 
Details

 

-
DeeCompareRowFunc ()

-
gint                (*DeeCompareRowFunc)                (GVariant **row1,
-                                                         GVariant **row2,
-                                                         gpointer user_data);

-

-Compares row1 and row2. Mainly used with dee_model_insert_sorted() and
-dee_model_find_sorted().
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


row1 :
The model being indexed
row2 :
The row to extract terms for
user_data :
User data to pass to comparison function. [closure]
-
Returns :
-1, 0, or 1 if row1 is respectively less than, equal, or greater
-than row2.

-

-

-

 
DeeModel

 
typedef struct _DeeModel DeeModel;

 

@@ -449,6 +394,10 @@
                                      DeeModelIter   *iter,
                                      DeeModelTag    *tag,
                                      gpointer        value);
+  
+  GVariant**     (*get_row)         (DeeModel       *self,
+                                     DeeModelIter   *iter,
+                                     GVariant      **out_row_members);
 };
 

 

@@ -622,119 +571,6 @@
-

dee_model_find_row_sorted ()

-
DeeModelIter *      dee_model_find_row_sorted           (DeeModel *self,
-                                                         GVariant **row_spec,
-                                                         DeeCompareRowFunc cmp_func,
-                                                         gpointer user_data,
-                                                         gboolean *out_was_found);
-

-Finds a row in self according to the sorting specified by cmp_func. -This method will assume that self is already sorted by cmp_func. -

-

-If you use this method for searching you should only use -dee_model_insert_row_sorted() to insert rows in the model. -

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - -

self :

The model to search

row_spec :

An array of -GVariants with type signature matching those of the -column schemas of self. No references will be taken on the variants. [array zero-terminated=1] -

cmp_func :

Callback used for comparison or rows. [scope call] -

user_data :

Arbitrary pointer passed to cmp_func during search. [closure] -

out_was_found :

A place to store a boolean value that will be set when -this method returns. If TRUE then an exact match was found. -If FALSE then the returned iter points to a row just after -where row_spec would have been inserted. -Pass NULL to ignore. [out] -

Returns :

If out_was_found is set to -TRUE then a DeeModelIter pointing to the first matching row. -If it is FALSE then the iter pointing to the row just after where -row_spec_would have been inserted. [transfer none][type Dee.ModelIter] -
-
-
-
-

dee_model_find_sorted ()

-
DeeModelIter *      dee_model_find_sorted               (DeeModel *self,
-                                                         DeeCompareRowFunc cmp_func,
-                                                         gpointer user_data,
-                                                         gboolean *out_was_found,
-                                                         ...);
-

-Finds a row in self according to the sorting specified by cmp_func. -This method will assume that self is already sorted by cmp_func. -

-

-If you use this method for searching you should only use -dee_model_insert_row_sorted() to insert rows in the model. -

-
-- - - - - - - - - - - - - - - - - - - - - - -

self :

The model to search

cmp_func :

Callback used for comparison or rows. [scope call] -

user_data :

Arbitrary pointer passed to cmp_func during search. [closure] -

out_was_found :

A place to store a boolean value that will be set when -this method returns. If TRUE then an exact match was found. -If FALSE then the returned iter points to a row just after -where row_spec would have been inserted. -Pass NULL to ignore. [out] -

Returns :

If out_was_found is set to -TRUE then a DeeModelIter pointing to the first matching row. -If it is FALSE then the iter pointing to the row just after where -row_spec_would have been inserted. [transfer none][type Dee.ModelIter] -
-
-
-

dee_model_get ()

void                dee_model_get                       (DeeModel *self,
                                                          DeeModelIter *iter,
@@ -1524,89 +1360,6 @@
-

dee_model_insert_row_sorted ()

-
DeeModelIter *      dee_model_insert_row_sorted         (DeeModel *self,
-                                                         GVariant **row_members,
-                                                         DeeCompareRowFunc cmp_func,
-                                                         gpointer user_data);
-

-Inserts a row in self according to the sorting specified by cmp_func. -If you use this method for insertion you should not use other methods as this -method assumes the model to be already sorted by cmp_func. -

-
-- - - - - - - - - - - - - - - - - - - - - - -

self :

The model to do a sorted insert on

row_members :

An array of -GVariants with type signature matching those of the -column schemas of self. If any of the variants have floating -references they will be consumed. [array zero-terminated=1] -

cmp_func :

Callback used for comparison or rows. [scope call] -

user_data :

Arbitrary pointer passed to cmp_func during search. [closure] -

Returns :

A DeeModelIter pointing to the new row. [transfer none][type Dee.ModelIter] -
-
-
-
-

dee_model_insert_sorted ()

-
DeeModelIter *      dee_model_insert_sorted             (DeeModel *self,
-                                                         DeeCompareRowFunc cmp_func,
-                                                         gpointer user_data,
-                                                         ...);
-

-Convenience function for calling dee_model_insert_row_sorted(). -Inserts a row in self according to the sorting specified by cmp_func. -If you use this method for insertion you should not use other methods as this -method assumes the model to be already sorted by cmp_func. -

-
-- - - - - - - - - - - - - - - - - - -

self :

The model to do a sorted insert on

cmp_func :

Callback used for comparison or rows. [scope call] -

user_data :

Arbitrary pointer passed to cmp_func during search. [closure] -

Returns :

A DeeModelIter pointing to the new row. [transfer none][type Dee.ModelIter] -
-
-
-

dee_model_is_first ()

gboolean            dee_model_is_first                  (DeeModel *self,
                                                          DeeModelIter *iter);
diff -Nru dee-1.0.4/doc/reference/dee-1.0/html/DeePeer.html dee-1.0.6/doc/reference/dee-1.0/html/DeePeer.html --- dee-1.0.4/doc/reference/dee-1.0/html/DeePeer.html 2012-02-17 10:12:40.000000000 +0000 +++ dee-1.0.6/doc/reference/dee-1.0/html/DeePeer.html 2012-03-12 08:21:22.000000000 +0000 @@ -6,19 +6,19 @@ - - + + - + - + - +