Couldn't find wdiff. Falling back to builtin diff colouring...
| dee-filter.h | | dee-filter.h | |
| | | | |
| skipping to change at line 33 | | skipping to change at line 33 | |
| | | | |
| #ifndef _HAVE_DEE_FILTERS_H | | #ifndef _HAVE_DEE_FILTERS_H | |
| #define _HAVE_DEE_FILTERS_H | | #define _HAVE_DEE_FILTERS_H | |
| | | | |
| #include <glib.h> | | #include <glib.h> | |
| #include <glib-object.h> | | #include <glib-object.h> | |
| #include <dee-filter-model.h> | | #include <dee-filter-model.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| typedef struct _DeeFilter DeeFilter; | | | |
| | | | |
| /** | | /** | |
| * DeeFilterMapFunc: | | * DeeFilterMapFunc: | |
| * @orig_model: The model containing the original data to filter | | * @orig_model: The model containing the original data to filter | |
| * @filter_model: The model that will contain the filtered results. The | | * @filter_model: The model that will contain the filtered results. The | |
| * filter func must iterate over @orig_model and add all rel
evant | | * filter func must iterate over @orig_model and add all rel
evant | |
| * rows to @filter_model. This model is guaranteed to be emp
ty | | * rows to @filter_model. This model is guaranteed to be emp
ty | |
| * when the filter func is invoked | | * when the filter func is invoked | |
| * @user_data: (closure): User data passed together with the filter func | | * @user_data: (closure): User data passed together with the filter func | |
| * | | * | |
| * Function used to collect the rows from a model that should be included i
n | | * Function used to collect the rows from a model that should be included i
n | |
| | | | |
End of changes. 1 change blocks. |
| 2 lines changed or deleted | | 0 lines changed or added | |
|
| dee-model-reader.h | | dee-model-reader.h | |
| | | | |
| skipping to change at line 33 | | skipping to change at line 33 | |
| | | | |
| #ifndef _HAVE_DEE_MODEL_READER_H | | #ifndef _HAVE_DEE_MODEL_READER_H | |
| #define _HAVE_DEE_MODEL_READER_H | | #define _HAVE_DEE_MODEL_READER_H | |
| | | | |
| #include <glib.h> | | #include <glib.h> | |
| #include <glib-object.h> | | #include <glib-object.h> | |
| #include <dee-model.h> | | #include <dee-model.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| typedef struct _DeeFilter DeeFilter; | | | |
| | | | |
| /** | | /** | |
| * DeeModelReaderFunc: | | * DeeModelReaderFunc: | |
| * @model: The model being indexed | | * @model: The model being indexed | |
| * @iter: The row to extract terms for | | * @iter: The row to extract terms for | |
| * @userdata: (closure):The data set when registering the reader | | * @userdata: (closure):The data set when registering the reader | |
| * | | * | |
| * Extracts a string from a row in a model. | | * Extracts a string from a row in a model. | |
| * | | * | |
| * Returns: A newly allocated string with the row data to be indexed. | | * Returns: A newly allocated string with the row data to be indexed. | |
| * Free with g_free(). | | * Free with g_free(). | |
| | | | |
End of changes. 1 change blocks. |
| 2 lines changed or deleted | | 0 lines changed or added | |
|
| dee-sequence-model.h | | dee-sequence-model.h | |
| | | | |
| skipping to change at line 71 | | skipping to change at line 71 | |
| */ | | */ | |
| struct _DeeSequenceModel | | struct _DeeSequenceModel | |
| { | | { | |
| /*< private >*/ | | /*< private >*/ | |
| DeeSerializableModel parent; | | DeeSerializableModel parent; | |
| | | | |
| DeeSequenceModelPrivate *priv; | | DeeSequenceModelPrivate *priv; | |
| }; | | }; | |
| | | | |
| /** | | /** | |
|
| * DBUS_INTERFACE_SEQUENCE_MODEL | | * DEE_SEQUENCE_MODEL_DBUS_IFACE: | |
| * | | * | |
| * 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 >*/ | |
| DeeSerializableModelClass parent_class; | | DeeSerializableModelClass parent_class; | |
| | | | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| dee-shared-model.h | | dee-shared-model.h | |
| | | | |
| skipping to change at line 72 | | skipping to change at line 72 | |
| */ | | */ | |
| struct _DeeSharedModel | | struct _DeeSharedModel | |
| { | | { | |
| /*< private >*/ | | /*< private >*/ | |
| DeeProxyModel parent; | | DeeProxyModel parent; | |
| | | | |
| DeeSharedModelPrivate *priv; | | DeeSharedModelPrivate *priv; | |
| }; | | }; | |
| | | | |
| /** | | /** | |
|
| * DBUS_INTERFACE_SHARED_MODEL | | * DEE_SHARED_MODEL_DBUS_IFACE: | |
| * | | * | |
| * String constant defining the name of the DBus Model interface. | | * String constant defining the name of the DBus Model interface. | |
| */ | | */ | |
| #define DEE_SHARED_MODEL_DBUS_IFACE "com.canonical.Dee.Model" | | #define DEE_SHARED_MODEL_DBUS_IFACE "com.canonical.Dee.Model" | |
| | | | |
| struct _DeeSharedModelClass | | struct _DeeSharedModelClass | |
| { | | { | |
| /*< private >*/ | | /*< private >*/ | |
| DeeProxyModelClass parent_class; | | DeeProxyModelClass parent_class; | |
| | | | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| dee-transaction.h | | dee-transaction.h | |
| | | | |
| skipping to change at line 104 | | skipping to change at line 104 | |
| * error domain is #DEE_TRANSACTION_ERROR. | | * error domain is #DEE_TRANSACTION_ERROR. | |
| * | | * | |
| * @DEE_TRANSACTION_ERROR_CONCURRENT_MODIFICATION: The target model has bee
n | | * @DEE_TRANSACTION_ERROR_CONCURRENT_MODIFICATION: The target model has bee
n | |
| * modified while the transaction was open. | | * modified while the transaction was open. | |
| * | | * | |
| * @DEE_TRANSACTION_ERROR_COMMITTED: Raised when someone tries to commit a | | * @DEE_TRANSACTION_ERROR_COMMITTED: Raised when someone tries to commit a | |
| * transaction that has already been committed | | * transaction that has already been committed | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| DEE_TRANSACTION_ERROR_CONCURRENT_MODIFICATION = 1, | | DEE_TRANSACTION_ERROR_CONCURRENT_MODIFICATION = 1, | |
|
| DEE_TRANSACTION_ERROR_COMMITTED = 2, | | DEE_TRANSACTION_ERROR_COMMITTED = 2 | |
| } DeeTransactionError; | | } DeeTransactionError; | |
| | | | |
| /** | | /** | |
| * dee_transaction_get_type: | | * dee_transaction_get_type: | |
| * | | * | |
| * The GType of #DeeTransaction | | * The GType of #DeeTransaction | |
| * | | * | |
| * Return value: the #GType of #DeeTransaction | | * Return value: the #GType of #DeeTransaction | |
| **/ | | **/ | |
| GType dee_transaction_get_type (void); | | GType dee_transaction_get_type (void); | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|