dee-index.h   dee-index.h 
skipping to change at line 113 skipping to change at line 113
* dee_analyzer_new_for_key_column() and dee_analyzer_new_for_full_text_col umn(). * dee_analyzer_new_for_key_column() and dee_analyzer_new_for_full_text_col umn().
* *
* You can access the analyzer used by a #DeeIndex via the * You can access the analyzer used by a #DeeIndex via the
* #DeeIndex:analyzer property. * #DeeIndex:analyzer property.
*/ */
struct _DeeAnalyzer struct _DeeAnalyzer
{ {
DeeAnalyzerFunc analyze; DeeAnalyzerFunc analyze;
gpointer userdata; gpointer userdata;
GDestroyNotify destroy; GDestroyNotify destroy;
/*< private >*/
gpointer reserved1;
gpointer reserved2;
gpointer reserved3;
gpointer reserved4;
gpointer reserved5;
}; };
/** /**
* DeeTermMatchFlag: * DeeTermMatchFlag:
* @DEE_TERM_MATCH_EXACT: Match terms byte for byte as specified in the * @DEE_TERM_MATCH_EXACT: Match terms byte for byte as specified in the
* query string * query string
* @DEE_TERM_MATCH_PREFIX: Match if the indexed term begins with the byte s tring * @DEE_TERM_MATCH_PREFIX: Match if the indexed term begins with the byte s tring
* being queried by. This is also sometimes known a s * being queried by. This is also sometimes known a s
* truncated- or wildcard queries * truncated- or wildcard queries
* *
skipping to change at line 172 skipping to change at line 179
gpointer userdata); gpointer userdata);
guint (* get_n_terms) (DeeIndex *self); guint (* get_n_terms) (DeeIndex *self);
guint (* get_n_rows) (DeeIndex *self); guint (* get_n_rows) (DeeIndex *self);
guint (* get_n_rows_for_term)(DeeIndex *self, guint (* get_n_rows_for_term)(DeeIndex *self,
const gchar *term); const gchar *term);
guint (*get_supported_term_match_flags) (DeeIndex *self); guint (*get_supported_term_match_flags) (DeeIndex *self);
/*< private >*/
void (*_dee_index_1) (void);
void (*_dee_index_2) (void);
void (*_dee_index_3) (void);
void (*_dee_index_4) (void);
void (*_dee_index_5) (void);
}; };
GType dee_index_get_type (void) G_GNUC_CONST; GType dee_index_get_type (void) G_GNUC_CONST;
DeeResultSet* dee_index_lookup (DeeIndex *self, DeeResultSet* dee_index_lookup (DeeIndex *self,
const gchar *term, const gchar *term,
DeeTermMatchFlag flags) ; DeeTermMatchFlag flags) ;
void dee_index_foreach (DeeIndex *self, void dee_index_foreach (DeeIndex *self,
const gchar *start_ term, const gchar *start_ term,
 End of changes. 2 change blocks. 
0 lines changed or deleted 14 lines changed or added


 dee-model.h   dee-model.h 
skipping to change at line 55 skipping to change at line 55
typedef struct _DeeModel DeeModel; typedef struct _DeeModel DeeModel;
/** /**
* DeeModelIter: * DeeModelIter:
* *
* The DeeModelIter structure is private and should only be used with the * The DeeModelIter structure is private and should only be used with the
* provided #DeeModel API. It is owned by DeeModel and should not be freed. * provided #DeeModel API. It is owned by DeeModel and should not be freed.
**/ **/
typedef struct _DeeModelIter DeeModelIter; typedef struct _DeeModelIter DeeModelIter;
/**
* DeeModelTag:
*
* The DeeModelTag structure is private and should only be used with the
* provided #DeeModel API. It is owned by DeeModel and should not be freed.
**/
typedef struct _DeeModelTag DeeModelTag;
struct _DeeModelIface struct _DeeModelIface
{ {
GTypeInterface g_iface; GTypeInterface g_iface;
/* Signals */ /* Signals */
void (*row_added) (DeeModel *self, void (*row_added) (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
void (*row_removed) (DeeModel *self, void (*row_removed) (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
skipping to change at line 170 skipping to change at line 178
gboolean (*is_first) (DeeModel *self, gboolean (*is_first) (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
gboolean (*is_last) (DeeModel *self, gboolean (*is_last) (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
guint (*get_position) (DeeModel *self, guint (*get_position) (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
void (*freeze_signals) (DeeModel *self); DeeModelTag* (*register_tag) (DeeModel *self,
GDestroyNotify tag_destroy);
void (*thaw_signals) (DeeModel *self); gpointer (*get_tag) (DeeModel *self,
DeeModelIter *iter,
DeeModelTag *tag);
void (*set_tag) (DeeModel *self,
DeeModelIter *iter,
DeeModelTag *tag,
gpointer value);
/*< private >*/
void (*_dee_model_1) (void);
void (*_dee_model_2) (void);
void (*_dee_model_3) (void);
void (*_dee_model_4) (void);
void (*_dee_model_5) (void);
void (*_dee_model_6) (void);
void (*_dee_model_7) (void);
void (*_dee_model_8) (void);
}; };
/** /**
* dee_model_get_type: * dee_model_get_type:
* *
* The GType of #DeeModel * The GType of #DeeModel
* *
* Return value: the #GType of #DeeModel * Return value: the #GType of #DeeModel
**/ **/
GType dee_model_get_type (void) G_GNUC_CONST; GType dee_model_get_type (void) G_GNUC_CONST;
skipping to change at line 339 skipping to change at line 364
gboolean dee_model_is_first (DeeModel *self, gboolean dee_model_is_first (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
gboolean dee_model_is_last (DeeModel *self, gboolean dee_model_is_last (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
guint dee_model_get_position (DeeModel *self, guint dee_model_get_position (DeeModel *self,
DeeModelIter *iter); DeeModelIter *iter);
void dee_model_freeze_signals (DeeModel *self); DeeModelTag* dee_model_register_tag (DeeModel *self,
GDestroyNotify tag_destroy);
void dee_model_thaw_signals (DeeModel *self); gpointer dee_model_get_tag (DeeModel *self,
DeeModelIter *iter,
DeeModelTag *tag);
void dee_model_set_tag (DeeModel *self,
DeeModelIter *iter,
DeeModelTag *tag,
gpointer value);
void dee_model_clear_tag (DeeModel *self,
DeeModelIter *iter,
DeeModelTag *tag);
GVariant** dee_model_build_row (DeeModel *self, GVariant** dee_model_build_row (DeeModel *self,
GVariant **out_row_members, GVariant **out_row_members,
...); ...);
GVariant** dee_model_build_row_valist (DeeModel *self, GVariant** dee_model_build_row_valist (DeeModel *self,
GVariant **out_row_members, GVariant **out_row_members,
va_list *args); va_list *args);
G_END_DECLS G_END_DECLS
 End of changes. 6 change blocks. 
4 lines changed or deleted 41 lines changed or added


 dee-proxy-model.h   dee-proxy-model.h 
skipping to change at line 31 skipping to change at line 31
#error "Only <dee.h> can be included directly." #error "Only <dee.h> can be included directly."
#endif #endif
#ifndef _HAVE_DEE_PROXY_MODEL_H #ifndef _HAVE_DEE_PROXY_MODEL_H
#define _HAVE_DEE_PROXY_MODEL_H #define _HAVE_DEE_PROXY_MODEL_H
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
#include <dee-model.h> #include <dee-model.h>
#include <dee-versioned-model.h> #include <dee-serializable-model.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define DEE_TYPE_PROXY_MODEL (dee_proxy_model_get_type ()) #define DEE_TYPE_PROXY_MODEL (dee_proxy_model_get_type ())
#define DEE_PROXY_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ #define DEE_PROXY_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
DEE_TYPE_PROXY_MODEL, DeeProxyModel)) DEE_TYPE_PROXY_MODEL, DeeProxyModel))
#define DEE_PROXY_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ #define DEE_PROXY_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
DEE_TYPE_PROXY_MODEL, DeeProxyModelClass)) DEE_TYPE_PROXY_MODEL, DeeProxyModelClass))
skipping to change at line 65 skipping to change at line 65
/** /**
* DeeProxyModel: * DeeProxyModel:
* *
* All fields in the DeeProxyModel structure are private and should never b e * All fields in the DeeProxyModel structure are private and should never b e
* accessed directly * accessed directly
*/ */
struct _DeeProxyModel struct _DeeProxyModel
{ {
/*< private >*/ /*< private >*/
DeeVersionedModel parent; DeeSerializableModel parent;
DeeProxyModelPrivate *priv; DeeProxyModelPrivate *priv;
}; };
struct _DeeProxyModelClass struct _DeeProxyModelClass
{ {
/*< private >*/ /*< private >*/
DeeVersionedModelClass parent_class; DeeSerializableModelClass parent_class;
/*< private >*/ /*< private >*/
void (*_dee_proxy_model_1) (void); void (*_dee_proxy_model_1) (void);
void (*_dee_proxy_model_2) (void); void (*_dee_proxy_model_2) (void);
void (*_dee_proxy_model_3) (void); void (*_dee_proxy_model_3) (void);
void (*_dee_proxy_model_4) (void); void (*_dee_proxy_model_4) (void);
}; };
/** /**
* dee_proxy_model_get_type: * dee_proxy_model_get_type:
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 dee-result-set.h   dee-result-set.h 
skipping to change at line 66 skipping to change at line 66
gboolean (*has_next) (DeeResultSet *self); gboolean (*has_next) (DeeResultSet *self);
DeeModelIter* (*peek) (DeeResultSet *self); DeeModelIter* (*peek) (DeeResultSet *self);
void (*seek) (DeeResultSet *self, void (*seek) (DeeResultSet *self,
guint pos); guint pos);
guint (*tell) (DeeResultSet *self); guint (*tell) (DeeResultSet *self);
DeeModel* (*get_model) (DeeResultSet *self); DeeModel* (*get_model) (DeeResultSet *self);
/*< private >*/
void (*_dee_result_set_1) (void);
void (*_dee_result_set_2) (void);
void (*_dee_result_set_3) (void);
void (*_dee_result_set_4) (void);
void (*_dee_result_set_5) (void);
}; };
GType dee_result_set_get_type (void) G_GNUC_CONST; GType dee_result_set_get_type (void) G_GNUC_CONST;
guint dee_result_set_get_n_rows (DeeResultSet *self); guint dee_result_set_get_n_rows (DeeResultSet *self);
DeeModelIter* dee_result_set_next (DeeResultSet *self); DeeModelIter* dee_result_set_next (DeeResultSet *self);
gboolean dee_result_set_has_next (DeeResultSet *self); gboolean dee_result_set_has_next (DeeResultSet *self);
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added


 dee-sequence-model.h   dee-sequence-model.h 
skipping to change at line 31 skipping to change at line 31
#error "Only <dee.h> can be included directly." #error "Only <dee.h> can be included directly."
#endif #endif
#ifndef _HAVE_DEE_SEQUENCE_MODEL_H #ifndef _HAVE_DEE_SEQUENCE_MODEL_H
#define _HAVE_DEE_SEQUENCE_MODEL_H #define _HAVE_DEE_SEQUENCE_MODEL_H
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
#include <dee-model.h> #include <dee-model.h>
#include <dee-versioned-model.h> #include <dee-serializable-model.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define DEE_TYPE_SEQUENCE_MODEL (dee_sequence_model_get_type ()) #define DEE_TYPE_SEQUENCE_MODEL (dee_sequence_model_get_type ())
#define DEE_SEQUENCE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ #define DEE_SEQUENCE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
DEE_TYPE_SEQUENCE_MODEL, DeeSequenceModel)) DEE_TYPE_SEQUENCE_MODEL, DeeSequenceModel))
#define DEE_SEQUENCE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ #define DEE_SEQUENCE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
DBUS_TYPE_SEQUENCE_MODEL, DeeSequenceModelClass)) DBUS_TYPE_SEQUENCE_MODEL, DeeSequenceModelClass))
skipping to change at line 65 skipping to change at line 65
/** /**
* DeeSequenceModel: * DeeSequenceModel:
* *
* All fields in the DeeSequenceModel structure are private and should neve r be * All fields in the DeeSequenceModel structure are private and should neve r be
* accessed directly * accessed directly
*/ */
struct _DeeSequenceModel struct _DeeSequenceModel
{ {
/*< private >*/ /*< private >*/
DeeVersionedModel parent; DeeSerializableModel parent;
DeeSequenceModelPrivate *priv; DeeSequenceModelPrivate *priv;
}; };
/** /**
* DBUS_INTERFACE_SEQUENCE_MODEL * DBUS_INTERFACE_SEQUENCE_MODEL
* *
* String constant defining the name of the DBus Model interface. * String constant defining the name of the DBus Model interface.
*/ */
#define DEE_SEQUENCE_MODEL_DBUS_IFACE "com.canonical.Dee.Model" #define DEE_SEQUENCE_MODEL_DBUS_IFACE "com.canonical.Dee.Model"
struct _DeeSequenceModelClass struct _DeeSequenceModelClass
{ {
/*< private >*/ /*< private >*/
DeeVersionedModelClass parent_class; DeeSerializableModelClass parent_class;
/*< private >*/ /*< private >*/
void (*_dee_sequence_model_1) (void); void (*_dee_sequence_model_1) (void);
void (*_dee_sequence_model_2) (void); void (*_dee_sequence_model_2) (void);
void (*_dee_sequence_model_3) (void); void (*_dee_sequence_model_3) (void);
void (*_dee_sequence_model_4) (void); void (*_dee_sequence_model_4) (void);
}; };
/** /**
* dee_sequence_model_get_type: * dee_sequence_model_get_type:
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 dee-shared-model.h   dee-shared-model.h 
skipping to change at line 102 skipping to change at line 102
DEE_SHARED_MODEL_ERROR_LEADER_INVALIDATED DEE_SHARED_MODEL_ERROR_LEADER_INVALIDATED
} DeeSharedModelError; } DeeSharedModelError;
/** /**
* dee_shared_model_get_type: * dee_shared_model_get_type:
* *
* The GType of #DeeSharedModel * The GType of #DeeSharedModel
* *
* Return value: the #GType of #DeeSharedModel * Return value: the #GType of #DeeSharedModel
**/ **/
GType dee_shared_model_get_type (void) G_GNUC_CONST; GType dee_shared_model_get_type (void);
DeeModel* dee_shared_model_new (const gchar *name); DeeModel* dee_shared_model_new (const gchar *name);
DeeModel* dee_shared_model_new_with_back_end (const gchar *name , DeeModel* dee_shared_model_new_with_back_end (const gchar *name ,
DeeModel *back_en d); DeeModel *back_en d);
const gchar* dee_shared_model_get_swarm_name (DeeSharedModel *sel f); const gchar* dee_shared_model_get_swarm_name (DeeSharedModel *sel f);
DeePeer* dee_shared_model_get_peer (DeeSharedModel *sel f); DeePeer* dee_shared_model_get_peer (DeeSharedModel *sel f);
gboolean dee_shared_model_is_leader (DeeSharedModel *sel f); gboolean dee_shared_model_is_leader (DeeSharedModel *sel f);
gboolean dee_shared_model_is_synchronized (DeeSharedModel *sel f); gboolean dee_shared_model_is_synchronized (DeeSharedModel *sel f);
guint dee_shared_model_flush_revision_queue (DeeSharedModel
*self);
G_END_DECLS G_END_DECLS
#endif /* _HAVE_DEE_SHARED_MODEL_H */ #endif /* _HAVE_DEE_SHARED_MODEL_H */
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 dee-term-list.h   dee-term-list.h 
skipping to change at line 82 skipping to change at line 82
const gchar* (* get_term) (DeeTermList *self, const gchar* (* get_term) (DeeTermList *self,
guint n); guint n);
void (* add_term) (DeeTermList *self, void (* add_term) (DeeTermList *self,
const gchar *term); const gchar *term);
guint (* num_terms) (DeeTermList *self); guint (* num_terms) (DeeTermList *self);
void (* clear) (DeeTermList *self); void (* clear) (DeeTermList *self);
/*< private >*/
void (*_dee_term_list_1) (void);
void (*_dee_term_list_2) (void);
void (*_dee_term_list_3) (void);
void (*_dee_term_list_4) (void);
}; };
GType dee_term_list_get_type (void) G_GNUC_CONST; GType dee_term_list_get_type (void) G_GNUC_CONST;
const gchar* dee_term_list_get_term (DeeTermList *self, const gchar* dee_term_list_get_term (DeeTermList *self,
guint n); guint n);
void dee_term_list_add_term (DeeTermList *self, void dee_term_list_add_term (DeeTermList *self,
const gchar *key); const gchar *key);
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 dee.h   dee.h 
skipping to change at line 34 skipping to change at line 34
* *
*/ */
#ifndef _HAVE_DEE_H_ #ifndef _HAVE_DEE_H_
#define _HAVE_DEE_H_ #define _HAVE_DEE_H_
#define _DEE_H_INSIDE #define _DEE_H_INSIDE
#include <dee-peer.h> #include <dee-peer.h>
#include <dee-model.h> #include <dee-model.h>
#include <dee-versioned-model.h> #include <dee-serializable-model.h>
#include <dee-proxy-model.h> #include <dee-proxy-model.h>
#include <dee-sequence-model.h> #include <dee-sequence-model.h>
#include <dee-shared-model.h> #include <dee-shared-model.h>
#include <dee-filter-model.h> #include <dee-filter-model.h>
#include <dee-index.h> #include <dee-index.h>
#include <dee-hash-index.h> #include <dee-hash-index.h>
#include <dee-term-list.h> #include <dee-term-list.h>
#include <dee-result-set.h> #include <dee-result-set.h>
#include <dee-analyzers.h> #include <dee-analyzers.h>
#include <dee-serializable.h>
#include <dee-resource-manager.h>
#include <dee-file-resource-manager.h>
#undef _DEE_H_INSIDE #undef _DEE_H_INSIDE
#endif /* _HAVE_DEE_H_ */ #endif /* _HAVE_DEE_H_ */
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/