[bijiben] Manager rename class from notebook to Manager
- From: Pierre-Yves Luyten <pyluyten src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [bijiben] Manager rename class from notebook to Manager
- Date: Thu, 31 Oct 2013 22:00:05 +0000 (UTC)
commit 3ccb3ca5c5e38e7995f03bbac64d248f7dd6d52a
Author: Pierre-Yves Luyten <py luyten fr>
Date: Thu Oct 31 22:58:44 2013 +0100
Manager rename class from notebook to Manager
NoteBook is confusing. Manager is better.
src/bjb-bijiben.c | 20 +-
src/bjb-bijiben.h | 2 +-
src/bjb-controller.c | 54 +++---
src/bjb-controller.h | 4 +-
src/bjb-editor-toolbar.c | 6 +-
src/bjb-main-toolbar.c | 10 +-
src/bjb-main-view.c | 20 +-
src/bjb-note-tag-dialog.c | 20 +-
src/bjb-selection-toolbar.c | 6 +-
src/bjb-settings-dialog.c | 6 +-
src/bjb-window-base.c | 8 +-
src/bjb-window-base.h | 2 +-
src/libbiji/Makefile.am | 4 +-
src/libbiji/biji-collection.c | 18 +-
src/libbiji/biji-collection.h | 2 +-
src/libbiji/biji-item.c | 22 +-
src/libbiji/biji-item.h | 2 +-
src/libbiji/biji-local-note.c | 6 +-
src/libbiji/biji-local-note.h | 2 +-
src/libbiji/{biji-note-book.c => biji-manager.c} | 238 +++++++++++-----------
src/libbiji/biji-manager.h | 137 +++++++++++++
src/libbiji/biji-note-book.h | 137 -------------
src/libbiji/biji-note-obj.c | 16 +-
src/libbiji/biji-tracker.c | 90 ++++----
src/libbiji/biji-tracker.h | 18 +-
src/libbiji/biji-zeitgeist.c | 5 +-
src/libbiji/editor/biji-webkit-editor.c | 4 +-
src/libbiji/libbiji.h | 2 +-
src/libbiji/provider/biji-import-provider.c | 14 +-
src/libbiji/provider/biji-import-provider.h | 8 +-
src/libbiji/provider/biji-local-provider.c | 18 +-
src/libbiji/provider/biji-local-provider.h | 4 +-
src/libbiji/provider/biji-own-cloud-note.c | 8 +-
src/libbiji/provider/biji-own-cloud-note.h | 2 +-
src/libbiji/provider/biji-own-cloud-provider.c | 34 ++--
src/libbiji/provider/biji-own-cloud-provider.h | 2 +-
src/libbiji/provider/biji-provider.c | 20 +-
src/libbiji/provider/biji-provider.h | 6 +-
38 files changed, 489 insertions(+), 488 deletions(-)
---
diff --git a/src/bjb-bijiben.c b/src/bjb-bijiben.c
index 050bba6..223843b 100644
--- a/src/bjb-bijiben.c
+++ b/src/bjb-bijiben.c
@@ -30,7 +30,7 @@
struct _BijibenPriv
{
- BijiNoteBook *book;
+ BijiManager *manager;
BjbSettings *settings;
@@ -68,7 +68,7 @@ on_window_activated_cb (BjbWindowBase *window,
while ((path = g_queue_pop_head (priv->to_open)))
{
- item = biji_note_book_get_item_at_path (priv->book, path);
+ item = biji_manager_get_item_at_path (priv->manager, path);
if (item != NULL)
{
@@ -134,7 +134,7 @@ bijiben_new_window_internal (Bijiben *self,
if (file != NULL)
{
path = g_file_get_parse_name (file);
- note = BIJI_NOTE_OBJ (biji_note_book_get_item_at_path (self->priv->book, path));
+ note = BIJI_NOTE_OBJ (biji_manager_get_item_at_path (self->priv->manager, path));
}
else if (item != NULL && BIJI_IS_NOTE_OBJ (item))
@@ -220,7 +220,7 @@ bijiben_import_notes (Bijiben *self, gchar *location)
{
g_debug ("IMPORT to %s", bjb_settings_get_default_location (self->priv->settings));
- biji_note_book_import_uri (self->priv->book,
+ biji_manager_import_uri (self->priv->manager,
bjb_settings_get_default_location (self->priv->settings),
location);
}
@@ -272,7 +272,7 @@ on_client_got (GObject *source_object,
if (g_strcmp0 (type, "owncloud") ==0)
{
g_message ("Loading account %s", goa_account_get_id (account));
- biji_note_book_add_goa_object (self->priv->book, object);
+ biji_manager_add_goa_object (self->priv->manager, object);
}
else
@@ -340,7 +340,7 @@ bijiben_startup (GApplication *application)
gdk_rgba_parse (&color, default_color);
error = NULL;
- self->priv->book = biji_note_book_new (storage, &color, &error);
+ self->priv->manager = biji_manager_new (storage, &color, &error);
if (error)
goto out;
@@ -373,7 +373,7 @@ bijiben_finalize (GObject *object)
{
Bijiben *self = BIJIBEN_APPLICATION (object);
- g_clear_object (&self->priv->book);
+ g_clear_object (&self->priv->manager);
g_clear_object (&self->priv->settings);
g_queue_free (self->priv->to_open);
@@ -404,10 +404,10 @@ bijiben_new (void)
NULL);
}
-BijiNoteBook *
-bijiben_get_book(Bijiben *self)
+BijiManager *
+bijiben_get_manager(Bijiben *self)
{
- return self->priv->book ;
+ return self->priv->manager ;
}
const gchar *
diff --git a/src/bjb-bijiben.h b/src/bjb-bijiben.h
index d3db73a..ba428c4 100644
--- a/src/bjb-bijiben.h
+++ b/src/bjb-bijiben.h
@@ -56,7 +56,7 @@ Bijiben *bijiben_new (void);
// Accessors
const gchar *bijiben_get_bijiben_dir (void);
-BijiNoteBook * bijiben_get_book(Bijiben *self);
+BijiManager * bijiben_get_manager(Bijiben *self);
BjbSettings * bjb_app_get_settings(gpointer application);
// Windows
diff --git a/src/bjb-controller.c b/src/bjb-controller.c
index 5718be1..35bb4ac 100644
--- a/src/bjb-controller.c
+++ b/src/bjb-controller.c
@@ -41,7 +41,7 @@
struct _BjbControllerPrivate
{
- BijiNoteBook *book ;
+ BijiManager *manager ;
gchar *needle ;
BijiCollection *collection;
GtkTreeModel *model ;
@@ -55,7 +55,7 @@ struct _BjbControllerPrivate
GMutex mutex;
gboolean connected;
- gulong book_change;
+ gulong manager_change;
};
@@ -73,7 +73,7 @@ static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
/* Currently used by toolbars */
enum {
SEARCH_CHANGED,
- DISPLAY_NOTES_CHANGED, // either search or book change
+ DISPLAY_NOTES_CHANGED, // either search or manager change
BJB_CONTROLLER_SIGNALS
};
@@ -149,7 +149,7 @@ bjb_controller_get_property (GObject *object,
switch (property_id)
{
case PROP_BOOK:
- g_value_set_object (value, self->priv->book);
+ g_value_set_object (value, self->priv->manager);
break;
case PROP_WINDOW:
g_value_set_object (value, self->priv->window);
@@ -177,7 +177,7 @@ bjb_controller_set_property (GObject *object,
switch (property_id)
{
case PROP_BOOK:
- bjb_controller_set_book(self,g_value_get_object(value));
+ bjb_controller_set_manager(self,g_value_get_object(value));
break;
case PROP_WINDOW:
self->priv->window = g_value_get_object (value);
@@ -222,7 +222,7 @@ bjb_controller_get_iter (BjbController *self,
/* Else we check for the first note */
else if (!needle && BIJI_IS_NOTE_OBJ (
- biji_note_book_get_item_at_path (self->priv->book, item_path)))
+ biji_manager_get_item_at_path (self->priv->manager, item_path)))
retval = TRUE;
g_free (item_path);
@@ -487,7 +487,7 @@ bjb_controller_apply_needle (BjbController *self)
/* Show all notes */
if (needle == NULL || g_strcmp0 (needle,"") == 0)
{
- all_notes = biji_note_book_get_items (self->priv->book);
+ all_notes = biji_manager_get_items (self->priv->manager);
/* If there are no note, report this */
if (all_notes == NULL)
@@ -502,7 +502,7 @@ bjb_controller_apply_needle (BjbController *self)
}
/* There is a research, apply lookup */
- biji_get_items_matching_async (self->priv->book, needle, update_controller_callback, self);
+ biji_get_items_matching_async (self->priv->manager, needle, update_controller_callback, self);
}
static void
@@ -516,8 +516,8 @@ on_needle_changed (BjbController *self)
/* Depending on the change at data level,
* the view has to be totaly refreshed or just amended */
static void
-on_book_changed (BijiNoteBook *book,
- BijiNoteBookChangeFlag flag,
+on_manager_changed (BijiManager *manager,
+ BijiManagerChangeFlag flag,
gpointer *biji_item,
BjbController *self)
{
@@ -532,7 +532,7 @@ on_book_changed (BijiNoteBook *book,
switch (flag)
{
/* If this is a *new* item, per def prepend */
- case BIJI_BOOK_ITEM_ADDED:
+ case BIJI_MANAGER_ITEM_ADDED:
if (BIJI_IS_NOTE_OBJ (item))
bjb_controller_get_iter (self, NULL, &p_iter);
@@ -546,7 +546,7 @@ on_book_changed (BijiNoteBook *book,
break;
/* Same comment, prepend but collection before note */
- case BIJI_BOOK_NOTE_AMENDED:
+ case BIJI_MANAGER_NOTE_AMENDED:
if (bjb_controller_get_iter (self, item, &p_iter))
{
gtk_list_store_remove (GTK_LIST_STORE (priv->model), p_iter);
@@ -562,7 +562,7 @@ on_book_changed (BijiNoteBook *book,
break;
/* If color changed we just amend the icon */
- case BIJI_BOOK_ITEM_ICON_CHANGED:
+ case BIJI_MANAGER_ITEM_ICON_CHANGED:
if (bjb_main_view_get_view_type (
bjb_window_base_get_main_view (self->priv->window)) == GD_MAIN_VIEW_ICON
&& bjb_controller_get_iter (self, item, &p_iter))
@@ -575,7 +575,7 @@ on_book_changed (BijiNoteBook *book,
GD_MAIN_COLUMN_ICON, biji_item_get_emblem (item), -1);
break;
- case BIJI_BOOK_ITEM_TRASHED:
+ case BIJI_MANAGER_ITEM_TRASHED:
if (bjb_controller_get_iter (self, item, &p_iter))
gtk_list_store_remove (GTK_LIST_STORE (priv->model), p_iter);
@@ -585,7 +585,7 @@ on_book_changed (BijiNoteBook *book,
default:
bjb_controller_apply_needle (self);
- if (flag == BIJI_BOOK_MASS_CHANGE)
+ if (flag == BIJI_MANAGER_MASS_CHANGE)
bjb_window_base_set_active (self->priv->window, TRUE);
}
@@ -599,8 +599,8 @@ bjb_controller_connect (BjbController *self)
if (!priv->connected)
{
- priv->book_change = g_signal_connect (self->priv->book, "changed",
- G_CALLBACK(on_book_changed), self);
+ priv->manager_change = g_signal_connect (self->priv->manager, "changed",
+ G_CALLBACK(on_manager_changed), self);
priv->connected = TRUE;
}
@@ -612,8 +612,8 @@ bjb_controller_disconnect (BjbController *self)
{
BjbControllerPrivate *priv = self->priv;
- g_signal_handler_disconnect (priv->book, priv->book_change);
- priv->book_change = 0;
+ g_signal_handler_disconnect (priv->manager, priv->manager_change);
+ priv->manager_change = 0;
}
static void
@@ -658,10 +658,10 @@ bjb_controller_class_init (BjbControllerClass *klass)
G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN);
- properties[PROP_BOOK] = g_param_spec_object ("book",
+ properties[PROP_BOOK] = g_param_spec_object ("manager",
"Book",
- "The BijiNoteBook",
- BIJI_TYPE_NOTE_BOOK,
+ "The BijiManager",
+ BIJI_TYPE_MANAGER,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS);
@@ -695,21 +695,21 @@ bjb_controller_class_init (BjbControllerClass *klass)
}
BjbController *
-bjb_controller_new (BijiNoteBook *book,
+bjb_controller_new (BijiManager *manager,
GtkWindow *window,
gchar *needle)
{
return g_object_new ( BJB_TYPE_CONTROLLER,
- "book", book,
+ "manager", manager,
"window", window,
"needle", needle,
NULL);
}
void
-bjb_controller_set_book (BjbController *self, BijiNoteBook *book )
+bjb_controller_set_manager (BjbController *self, BijiManager *manager )
{
- self->priv->book = book ;
+ self->priv->manager = manager ;
}
void
@@ -774,7 +774,7 @@ bjb_controller_set_collection (BjbController *self,
self->priv->needle = g_strdup ("");
self->priv->collection = coll;
- biji_get_items_with_collection_async (self->priv->book,
+ biji_get_items_with_collection_async (self->priv->manager,
biji_item_get_title (BIJI_ITEM (coll)),
update_controller_callback,
self);
diff --git a/src/bjb-controller.h b/src/bjb-controller.h
index c2d55d5..5dda3c2 100644
--- a/src/bjb-controller.h
+++ b/src/bjb-controller.h
@@ -52,7 +52,7 @@ struct _BjbController
GType bjb_controller_get_type (void) G_GNUC_CONST;
-BjbController * bjb_controller_new (BijiNoteBook *book,
+BjbController * bjb_controller_new (BijiManager *manager,
GtkWindow *bjb_window_base,
gchar *needle);
@@ -60,7 +60,7 @@ void bjb_controller_apply_needle (BjbController *self);
void bjb_controller_update_view (BjbController *self);
-void bjb_controller_set_book (BjbController * self, BijiNoteBook * book ) ;
+void bjb_controller_set_manager (BjbController * self, BijiManager * manager ) ;
void bjb_controller_set_needle (BjbController *self, const gchar *needle ) ;
diff --git a/src/bjb-editor-toolbar.c b/src/bjb-editor-toolbar.c
index 1bb4f62..a45876b 100644
--- a/src/bjb-editor-toolbar.c
+++ b/src/bjb-editor-toolbar.c
@@ -294,7 +294,7 @@ link_callback (GtkWidget *button, BjbEditorToolbar *self)
GtkWidget *window;
BijiNoteObj *result;
GdkRGBA color;
- BijiNoteBook *book;
+ BijiManager *manager;
BjbEditorToolbarPrivate *priv = self->priv;
link = biji_note_obj_editor_get_selection (priv->note);
@@ -303,10 +303,10 @@ link_callback (GtkWidget *button, BjbEditorToolbar *self)
return;
window = bjb_note_view_get_base_window (priv->view);
- book = bjb_window_base_get_book(window);
+ manager = bjb_window_base_get_manager(window);
settings = bjb_app_get_settings (g_application_get_default ());
- result = biji_note_book_note_new (book,
+ result = biji_manager_note_new (manager,
link,
bjb_settings_get_default_location (settings));
diff --git a/src/bjb-main-toolbar.c b/src/bjb-main-toolbar.c
index e2d1193..61b1e13 100644
--- a/src/bjb-main-toolbar.c
+++ b/src/bjb-main-toolbar.c
@@ -107,13 +107,13 @@ static void
on_new_note_clicked (GtkWidget *but, BjbMainView *view)
{
BijiNoteObj *result;
- BijiNoteBook *book;
+ BijiManager *manager;
BjbSettings *settings;
/* append note to collection */
- book = bjb_window_base_get_book (bjb_main_view_get_window (view));
+ manager = bjb_window_base_get_manager (bjb_main_view_get_window (view));
settings = bjb_app_get_settings (g_application_get_default ());
- result = biji_note_book_note_new (book,
+ result = biji_manager_note_new (manager,
NULL,
bjb_settings_get_default_location (settings));
@@ -600,8 +600,8 @@ delete_item_callback (GtkWidget *item, gpointer user_data)
/* Delete the note from collection
* The deleted note will emit a signal. */
- biji_note_book_remove_item (
- bjb_window_base_get_book (GTK_WIDGET (self->priv->window)),
+ biji_manager_remove_item (
+ bjb_window_base_get_manager (GTK_WIDGET (self->priv->window)),
BIJI_ITEM (self->priv->note));
}
diff --git a/src/bjb-main-view.c b/src/bjb-main-view.c
index f1ee802..6b3636e 100644
--- a/src/bjb-main-view.c
+++ b/src/bjb-main-view.c
@@ -260,8 +260,8 @@ bjb_main_view_get_selected_items (BjbMainView *view)
for (l=paths; l!= NULL; l=l->next)
{
url = get_note_url_from_tree_path (l->data, view);
- item = biji_note_book_get_item_at_path (
- bjb_window_base_get_book (view->priv->window), url);
+ item = biji_manager_get_item_at_path (
+ bjb_window_base_get_manager (view->priv->window), url);
if (BIJI_IS_ITEM (item))
result = g_list_prepend (result, item);
@@ -334,7 +334,7 @@ on_item_activated (GdMainView * gd,
const GtkTreePath * path,
BjbMainView * view)
{
- BijiNoteBook * book ;
+ BijiManager * manager ;
BijiItem * to_open ;
GtkTreeIter iter ;
gchar * item_path ;
@@ -348,8 +348,8 @@ on_item_activated (GdMainView * gd,
g_return_val_if_fail (item_path != NULL, FALSE); // #709197
/* Switch to that item */
- book = bjb_window_base_get_book (view->priv->window);
- to_open = biji_note_book_get_item_at_path (book, item_path);
+ manager = bjb_window_base_get_manager (view->priv->window);
+ to_open = biji_manager_get_item_at_path (manager, item_path);
g_free (item_path);
if (to_open)
@@ -380,15 +380,15 @@ on_drag_data_received (GtkWidget *widget,
if (text)
{
- BijiNoteBook *book;
+ BijiManager *manager;
BijiNoteObj *ret;
BjbMainView *self = BJB_MAIN_VIEW (user_data);
BjbSettings *settings;
/* FIXME Text is guchar utf 8, conversion to perform */
- book = bjb_window_base_get_book (self->priv->window);
+ manager = bjb_window_base_get_manager (self->priv->window);
settings = bjb_app_get_settings (g_application_get_default ());
- ret = biji_note_book_note_new (book,
+ ret = biji_manager_note_new (manager,
(gchar*) text,
bjb_settings_get_default_location (settings));
switch_to_note_view (self, ret); // maybe AFTER drag finish?
@@ -455,8 +455,8 @@ _get_item_for_tree_path (GtkTreeModel *tree_model,
if (uuid != NULL)
{
- retval = biji_note_book_get_item_at_path (
- bjb_window_base_get_book (self->priv->window), uuid);
+ retval = biji_manager_get_item_at_path (
+ bjb_window_base_get_manager (self->priv->window), uuid);
g_free (uuid);
}
diff --git a/src/bjb-note-tag-dialog.c b/src/bjb-note-tag-dialog.c
index be2661a..e84bd77 100644
--- a/src/bjb-note-tag-dialog.c
+++ b/src/bjb-note-tag-dialog.c
@@ -195,11 +195,11 @@ bjb_note_tag_dialog_handle_tags (GHashTable *result, gpointer user_data)
static void
update_collections_model_async (BjbNoteTagDialog *self)
{
- BijiNoteBook *book;
+ BijiManager *manager;
- book = bjb_window_base_get_book (GTK_WIDGET (self->priv->window));
+ manager = bjb_window_base_get_manager (GTK_WIDGET (self->priv->window));
gtk_list_store_clear (self->priv->store);
- biji_get_all_collections_async (book, bjb_note_tag_dialog_handle_tags, self);
+ biji_get_all_collections_async (manager, bjb_note_tag_dialog_handle_tags, self);
}
/* Libbiji handles tracker & saving */
@@ -231,7 +231,7 @@ on_tag_toggled (GtkCellRendererToggle *cell,
gint toggle_item;
gint *column;
gchar *tag;
- BijiNoteBook *book;
+ BijiManager *manager;
BijiItem *collection;
column = g_object_get_data (G_OBJECT (cell), "column");
@@ -240,8 +240,8 @@ on_tag_toggled (GtkCellRendererToggle *cell,
gtk_tree_model_get (model, &iter, COL_URN, &tag, -1);
priv->toggled_collection = tag;
- book = bjb_window_base_get_book (GTK_WIDGET (self->priv->window));
- collection = biji_note_book_get_item_at_path (book, tag);
+ manager = bjb_window_base_get_manager (GTK_WIDGET (self->priv->window));
+ collection = biji_manager_get_item_at_path (manager, tag);
if (BIJI_IS_COLLECTION (collection))
{
@@ -280,17 +280,17 @@ on_new_collection_created_cb (BijiItem *coll, gpointer user_data)
gtk_entry_set_text (GTK_ENTRY (priv->entry), "");
}
-/* Gives the title and book :
- * the collection is created & book updated.
+/* Gives the title and manager :
+ * the collection is created & manager updated.
* afterward, our callback comes */
static void
add_new_tag (BjbNoteTagDialog *self)
{
- BijiNoteBook *book = bjb_window_base_get_book (GTK_WIDGET (self->priv->window));
+ BijiManager *manager = bjb_window_base_get_manager (GTK_WIDGET (self->priv->window));
const gchar *title = gtk_entry_get_text (GTK_ENTRY (self->priv->entry));
if (title && g_utf8_strlen (title, -1) > 0)
- biji_create_new_collection_async (book, title, on_new_collection_created_cb, self);
+ biji_create_new_collection_async (manager, title, on_new_collection_created_cb, self);
}
static void
diff --git a/src/bjb-selection-toolbar.c b/src/bjb-selection-toolbar.c
index 06901f7..2cab5a9 100644
--- a/src/bjb-selection-toolbar.c
+++ b/src/bjb-selection-toolbar.c
@@ -116,14 +116,14 @@ static void
action_delete_selected_items (GtkWidget *w, BjbSelectionToolbar *self)
{
GList *l, *selection;
- BijiNoteBook *book;
+ BijiManager *manager;
selection = bjb_main_view_get_selected_items (self->priv->view);
- book = bjb_window_base_get_book (bjb_main_view_get_window (self->priv->view));
+ manager = bjb_window_base_get_manager (bjb_main_view_get_window (self->priv->view));
for (l=selection; l !=NULL; l=l->next)
{
- biji_note_book_remove_item (book, BIJI_ITEM (l->data));
+ biji_manager_remove_item (manager, BIJI_ITEM (l->data));
}
bjb_main_view_set_selection_mode (self->priv->view, FALSE);
diff --git a/src/bjb-settings-dialog.c b/src/bjb-settings-dialog.c
index 088b9a3..715f7a1 100644
--- a/src/bjb-settings-dialog.c
+++ b/src/bjb-settings-dialog.c
@@ -40,7 +40,7 @@ struct BjbSettingsDialogPrivate_
{
GtkWidget *parent;
BjbSettings *settings;
- BijiNoteBook *book;
+ BijiManager *manager;
GtkStack *stack;
GtkStackSwitcher *switcher;
@@ -352,7 +352,7 @@ create_page_primary (BjbSettingsDialog *self)
/* Add providers */
- providers_info = biji_note_book_get_providers (priv->book);
+ providers_info = biji_manager_get_providers (priv->manager);
g_list_foreach (providers_info, add_child, self);
g_list_free (providers_info);
@@ -454,7 +454,7 @@ bjb_settings_dialog_constructed (GObject *object)
app = g_application_get_default ();
- priv->book = bijiben_get_book (BIJIBEN_APPLICATION (app));
+ priv->manager = bijiben_get_manager (BIJIBEN_APPLICATION (app));
priv->settings = bjb_app_get_settings (app);
diff --git a/src/bjb-window-base.c b/src/bjb-window-base.c
index 650e058..ff9e2b0 100644
--- a/src/bjb-window-base.c
+++ b/src/bjb-window-base.c
@@ -143,7 +143,7 @@ bjb_window_base_constructed (GObject *obj)
priv->font = pango_font_description_from_string (BJB_DEFAULT_FONT);
priv->controller = bjb_controller_new
- (bijiben_get_book (BIJIBEN_APPLICATION(g_application_get_default())),
+ (bijiben_get_manager (BIJIBEN_APPLICATION(g_application_get_default())),
GTK_WINDOW (obj),
priv->entry );
@@ -365,10 +365,10 @@ bjb_window_base_get_view_type (BjbWindowBase *win)
return win->priv->current_view;
}
-BijiNoteBook *
-bjb_window_base_get_book(GtkWidget * win)
+BijiManager *
+bjb_window_base_get_manager(GtkWidget * win)
{
- return bijiben_get_book (BIJIBEN_APPLICATION (g_application_get_default()));
+ return bijiben_get_manager (BIJIBEN_APPLICATION (g_application_get_default()));
}
void
diff --git a/src/bjb-window-base.h b/src/bjb-window-base.h
index d2ae604..e225b74 100644
--- a/src/bjb-window-base.h
+++ b/src/bjb-window-base.h
@@ -55,7 +55,7 @@ void bjb_window_base_switch_to_item (BjbWindowBase *bwb, BijiItem *item);
BjbWindowViewType bjb_window_base_get_view_type (BjbWindowBase *win);
-BijiNoteBook * bjb_window_base_get_book(GtkWidget * win);
+BijiManager * bjb_window_base_get_manager(GtkWidget * win);
void bjb_window_base_set_entry(GtkWidget *win, gchar *search_entry) ;
diff --git a/src/libbiji/Makefile.am b/src/libbiji/Makefile.am
index 78ca950..e3618b3 100644
--- a/src/libbiji/Makefile.am
+++ b/src/libbiji/Makefile.am
@@ -43,12 +43,12 @@ libbiji_la_SOURCES = \
biji-item.h \
biji-local-note.c \
biji-local-note.h \
+ biji-manager.c \
+ biji-manager.h \
biji-note-id.c \
biji-note-id.h \
biji-note-obj.c \
biji-note-obj.h \
- biji-note-book.c \
- biji-note-book.h \
biji-string.c \
biji-string.h \
biji-timeout.c \
diff --git a/src/libbiji/biji-collection.c b/src/libbiji/biji-collection.c
index 057925f..88688b9 100644
--- a/src/libbiji/biji-collection.c
+++ b/src/libbiji/biji-collection.c
@@ -273,7 +273,7 @@ biji_collection_trash (BijiItem *item)
self = BIJI_COLLECTION (item);
g_signal_emit (G_OBJECT (item), biji_collections_signals[COLLECTION_DELETED], 0);
- biji_remove_collection_from_tracker (biji_item_get_book (item), self->priv->urn);
+ biji_remove_collection_from_tracker (biji_item_get_manager (item), self->priv->urn);
g_object_unref (self);
return TRUE;
@@ -361,10 +361,10 @@ static void
on_collected_item_change (BijiCollection *self)
{
BijiCollectionPrivate *priv = self->priv;
- BijiNoteBook *book;
+ BijiManager *manager;
GList *l;
- book = biji_item_get_book (BIJI_ITEM (self));
+ manager = biji_item_get_manager (BIJI_ITEM (self));
/* Diconnected any handler */
for (l= priv->collected_items; l!= NULL; l=l->next)
@@ -373,7 +373,7 @@ on_collected_item_change (BijiCollection *self)
}
/* Then re-process the whole stuff */
- biji_get_items_with_collection_async (book,
+ biji_get_items_with_collection_async (manager,
self->priv->name,
biji_collection_update_collected,
self);
@@ -418,12 +418,12 @@ static void
biji_collection_constructed (GObject *obj)
{
BijiCollection *self = BIJI_COLLECTION (obj);
- BijiNoteBook *book;
+ BijiManager *manager;
- book = biji_item_get_book (BIJI_ITEM (obj));
+ manager = biji_item_get_manager (BIJI_ITEM (obj));
- biji_get_items_with_collection_async (book,
+ biji_get_items_with_collection_async (manager,
self->priv->name,
biji_collection_update_collected,
self);
@@ -544,10 +544,10 @@ biji_collection_init (BijiCollection *self)
BijiCollection *
-biji_collection_new (GObject *book, gchar *urn, gchar *name, gint64 mtime)
+biji_collection_new (GObject *manager, gchar *urn, gchar *name, gint64 mtime)
{
return g_object_new (BIJI_TYPE_COLLECTION,
- "note-book", book,
+ "manager", manager,
"name", name,
"urn", urn,
"mtime", mtime,
diff --git a/src/libbiji/biji-collection.h b/src/libbiji/biji-collection.h
index 073c51a..8182e8f 100644
--- a/src/libbiji/biji-collection.h
+++ b/src/libbiji/biji-collection.h
@@ -55,7 +55,7 @@ GType biji_collection_get_type (void);
/* Exiting coll in tracker : provide urn & iso8601 date
* To create a brand new collection in tracker rather gobjectize existing one,
* see biji_create_new_collection_async */
-BijiCollection * biji_collection_new (GObject *book, gchar *urn, gchar *name, gint64 mtime);
+BijiCollection * biji_collection_new (GObject *manager, gchar *urn, gchar *name, gint64 mtime);
/* Watching for tracker would be best. Right now manually called. */
diff --git a/src/libbiji/biji-item.c b/src/libbiji/biji-item.c
index e3ac18d..01da173 100644
--- a/src/libbiji/biji-item.c
+++ b/src/libbiji/biji-item.c
@@ -18,7 +18,7 @@
*/
#include "biji-item.h"
-#include "biji-note-book.h"
+#include "biji-manager.h"
/* Properties */
enum {
@@ -33,7 +33,7 @@ static GParamSpec *properties[BIJI_ITEM_PROP] = { NULL, };
struct BijiItemPrivate_
{
- BijiNoteBook *book;
+ BijiManager *manager;
};
static void biji_item_finalize (GObject *object);
@@ -53,7 +53,7 @@ biji_item_set_property (GObject *object,
switch (property_id)
{
case PROP_BOOK:
- self->priv->book = g_value_dup_object (value);
+ self->priv->manager = g_value_dup_object (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -73,7 +73,7 @@ biji_item_get_property (GObject *object,
switch (property_id)
{
case PROP_BOOK:
- g_value_set_object (value, self->priv->book);
+ g_value_set_object (value, self->priv->manager);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -93,10 +93,10 @@ biji_item_class_init (BijiItemClass *klass)
g_object_class->finalize = biji_item_finalize;
properties[PROP_BOOK] =
- g_param_spec_object("note-book",
- "Note Book",
- "The Note Book controlling this item",
- BIJI_TYPE_NOTE_BOOK,
+ g_param_spec_object("manager",
+ "Note Manager",
+ "The Note Manager controlling this item",
+ BIJI_TYPE_MANAGER,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_properties (g_object_class, BIJI_ITEM_PROP, properties);
@@ -118,7 +118,7 @@ static void
biji_item_init (BijiItem *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, BIJI_TYPE_ITEM, BijiItemPrivate);
- self->priv->book = NULL;
+ self->priv->manager = NULL;
}
const gchar *
@@ -135,9 +135,9 @@ biji_item_get_uuid (BijiItem *item)
gpointer
-biji_item_get_book (BijiItem *item)
+biji_item_get_manager (BijiItem *item)
{
- return item->priv->book;
+ return item->priv->manager;
}
diff --git a/src/libbiji/biji-item.h b/src/libbiji/biji-item.h
index 5bfa26f..c02c28a 100644
--- a/src/libbiji/biji-item.h
+++ b/src/libbiji/biji-item.h
@@ -93,7 +93,7 @@ const gchar * biji_item_get_title (BijiItem *item);
const gchar * biji_item_get_uuid (BijiItem *item);
-gpointer biji_item_get_book (BijiItem *item);
+gpointer biji_item_get_manager (BijiItem *item);
gboolean biji_item_has_color (BijiItem *item);
diff --git a/src/libbiji/biji-local-note.c b/src/libbiji/biji-local-note.c
index d7b9e83..7b0758b 100644
--- a/src/libbiji/biji-local-note.c
+++ b/src/libbiji/biji-local-note.c
@@ -99,7 +99,7 @@ local_note_save (BijiNoteObj *note)
info->created = biji_note_obj_get_create_date (note);
info->datasource_urn = g_strdup (prov_info->datasource);
- biji_tracker_ensure_ressource_from_info (biji_item_get_book (item),
+ biji_tracker_ensure_ressource_from_info (biji_item_get_manager (item),
info);
}
@@ -233,7 +233,7 @@ biji_local_note_class_init (BijiLocalNoteClass *klass)
BijiNoteObj *
biji_local_note_new_from_info (BijiProvider *provider,
- BijiNoteBook *book,
+ BijiManager *manager,
BijiInfoSet *set)
{
BijiNoteID *id;
@@ -243,7 +243,7 @@ biji_local_note_new_from_info (BijiProvider *provider,
id = biji_note_id_new_from_info (set);
obj = g_object_new (BIJI_TYPE_LOCAL_NOTE,
- "note-book", book,
+ "manager", manager,
"id", id,
NULL);
diff --git a/src/libbiji/biji-local-note.h b/src/libbiji/biji-local-note.h
index 832987e..2bbb8f7 100644
--- a/src/libbiji/biji-local-note.h
+++ b/src/libbiji/biji-local-note.h
@@ -52,7 +52,7 @@ GType biji_local_note_get_type (void);
BijiNoteObj *biji_local_note_new_from_info (BijiProvider *provider,
- BijiNoteBook *book,
+ BijiManager *manager,
BijiInfoSet *set);
G_END_DECLS
diff --git a/src/libbiji/biji-note-book.c b/src/libbiji/biji-manager.c
similarity index 66%
rename from src/libbiji/biji-note-book.c
rename to src/libbiji/biji-manager.c
index 929ff5f..26b921d 100644
--- a/src/libbiji/biji-note-book.c
+++ b/src/libbiji/biji-manager.c
@@ -1,4 +1,4 @@
-/* bjb-note-book.c
+/* bjb-note-manager.c
* Copyright (C) Pierre-Yves LUYTEN 2012 <py luyten fr>
*
* bijiben is free software: you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
#include "provider/biji-own-cloud-provider.h"
-struct _BijiNoteBookPrivate
+struct _BijiManagerPrivate
{
/* Notes & Collections.
* Keep a direct pointer to local provider for convenience. */
@@ -59,24 +59,24 @@ enum {
PROP_LOCATION,
PROP_COLOR,
PROP_ERROR,
- BIJI_BOOK_PROPERTIES
+ BIJI_MANAGER_PROPERTIES
};
/* Signals */
enum {
BOOK_AMENDED,
- BIJI_BOOK_SIGNALS
+ BIJI_MANAGER_SIGNALS
};
-static guint biji_book_signals[BIJI_BOOK_SIGNALS] = { 0 };
-static GParamSpec *properties[BIJI_BOOK_PROPERTIES] = { NULL, };
+static guint biji_manager_signals[BIJI_MANAGER_SIGNALS] = { 0 };
+static GParamSpec *properties[BIJI_MANAGER_PROPERTIES] = { NULL, };
-#define BIJI_NOTE_BOOK_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BIJI_TYPE_NOTE_BOOK,
BijiNoteBookPrivate))
+#define BIJI_MANAGER_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BIJI_TYPE_MANAGER, BijiManagerPrivate))
-G_DEFINE_TYPE (BijiNoteBook, biji_note_book, G_TYPE_OBJECT);
+G_DEFINE_TYPE (BijiManager, biji_manager, G_TYPE_OBJECT);
@@ -84,12 +84,12 @@ G_DEFINE_TYPE (BijiNoteBook, biji_note_book, G_TYPE_OBJECT);
static void
-biji_note_book_init (BijiNoteBook *self)
+biji_manager_init (BijiManager *self)
{
- BijiNoteBookPrivate *priv;
+ BijiManagerPrivate *priv;
- priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, BIJI_TYPE_NOTE_BOOK,
- BijiNoteBookPrivate);
+ priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, BIJI_TYPE_MANAGER,
+ BijiManagerPrivate);
/* Item path is key for table */
priv->items = g_hash_table_new_full (g_str_hash,
@@ -111,28 +111,28 @@ biji_note_book_init (BijiNoteBook *self)
#ifdef BUILD_ZEITGEIST
ZeitgeistLog *
-biji_note_book_get_zg_log (BijiNoteBook *book)
+biji_manager_get_zg_log (BijiManager *manager)
{
- return book->priv->log;
+ return manager->priv->log;
}
#endif /* BUILD_ZEITGEIST */
TrackerSparqlConnection *
-biji_note_book_get_tracker_connection (BijiNoteBook *book)
+biji_manager_get_tracker_connection (BijiManager *manager)
{
- return book->priv->connection;
+ return manager->priv->connection;
}
GList *
-biji_note_book_get_providers (BijiNoteBook *book)
+biji_manager_get_providers (BijiManager *manager)
{
GList *providers, *l, *retval;
retval = NULL;
- providers = g_hash_table_get_values (book->priv->providers);
+ providers = g_hash_table_get_values (manager->priv->providers);
for (l = providers; l != NULL; l = l->next)
{
@@ -146,27 +146,27 @@ biji_note_book_get_providers (BijiNoteBook *book)
static void
-biji_note_book_finalize (GObject *object)
+biji_manager_finalize (GObject *object)
{
- BijiNoteBook *book = BIJI_NOTE_BOOK (object) ;
+ BijiManager *manager = BIJI_MANAGER (object) ;
- g_clear_object (&book->priv->location);
- g_hash_table_destroy (book->priv->items);
+ g_clear_object (&manager->priv->location);
+ g_hash_table_destroy (manager->priv->items);
- G_OBJECT_CLASS (biji_note_book_parent_class)->finalize (object);
+ G_OBJECT_CLASS (biji_manager_parent_class)->finalize (object);
}
static void
-biji_note_book_set_property (GObject *object,
+biji_manager_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
- BijiNoteBook *self = BIJI_NOTE_BOOK (object);
+ BijiManager *self = BIJI_MANAGER (object);
GdkRGBA *color;
switch (property_id)
@@ -194,12 +194,12 @@ biji_note_book_set_property (GObject *object,
}
static void
-biji_note_book_get_property (GObject *object,
+biji_manager_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
- BijiNoteBook *self = BIJI_NOTE_BOOK (object);
+ BijiManager *self = BIJI_MANAGER (object);
switch (property_id)
{
@@ -213,13 +213,13 @@ biji_note_book_get_property (GObject *object,
}
static gboolean
-title_is_unique (BijiNoteBook *book, gchar *title)
+title_is_unique (BijiManager *manager, gchar *title)
{
gboolean is_unique = TRUE;
BijiItem *iter;
GList *items, *l;
- items = g_hash_table_get_values (book->priv->items);
+ items = g_hash_table_get_values (manager->priv->items);
for ( l=items ; l != NULL ; l = l->next)
{
@@ -241,9 +241,9 @@ title_is_unique (BijiNoteBook *book, gchar *title)
/* If title not unique, add sufffix "n", starting with 2, until ok */
gchar *
-biji_note_book_get_unique_title (BijiNoteBook *book, const gchar *title)
+biji_manager_get_unique_title (BijiManager *manager, const gchar *title)
{
- if (!book)
+ if (!manager)
return g_strdup (title);
gchar *new_title;
@@ -254,7 +254,7 @@ biji_note_book_get_unique_title (BijiNoteBook *book, const gchar *title)
new_title = g_strdup (title);
gint suffix = 2;
- while (!title_is_unique (book, new_title))
+ while (!title_is_unique (manager, new_title))
{
g_free (new_title);
new_title = g_strdup_printf("%s (%i)", title, suffix);
@@ -266,13 +266,13 @@ biji_note_book_get_unique_title (BijiNoteBook *book, const gchar *title)
void
-biji_note_book_notify_changed (BijiNoteBook *book,
- BijiNoteBookChangeFlag flag,
+biji_manager_notify_changed (BijiManager *manager,
+ BijiManagerChangeFlag flag,
BijiItem *item)
{
- g_debug ("book: notify changed, %i", flag);
- g_signal_emit (book,
- biji_book_signals[BOOK_AMENDED],
+ g_debug ("manager: notify changed, %i", flag);
+ g_signal_emit (manager,
+ biji_manager_signals[BOOK_AMENDED],
0,
flag,
item);
@@ -282,46 +282,46 @@ biji_note_book_notify_changed (BijiNoteBook *book,
/* TODO : use the same for note, put everything there
* rather calling a func */
static void
-on_item_deleted_cb (BijiItem *item, BijiNoteBook *book)
+on_item_deleted_cb (BijiItem *item, BijiManager *manager)
{
- biji_note_book_remove_item (book, item);
+ biji_manager_remove_item (manager, item);
}
void
-book_on_note_changed_cb (BijiNoteObj *note, BijiNoteBook *book)
+manager_on_note_changed_cb (BijiNoteObj *note, BijiManager *manager)
{
- biji_note_book_notify_changed (book, BIJI_BOOK_NOTE_AMENDED, BIJI_ITEM (note));
+ biji_manager_notify_changed (manager, BIJI_MANAGER_NOTE_AMENDED, BIJI_ITEM (note));
}
static void
-book_on_item_icon_changed_cb (BijiNoteObj *note, BijiNoteBook *book)
+manager_on_item_icon_changed_cb (BijiNoteObj *note, BijiManager *manager)
{
- biji_note_book_notify_changed (book, BIJI_BOOK_ITEM_ICON_CHANGED, BIJI_ITEM (note));
+ biji_manager_notify_changed (manager, BIJI_MANAGER_ITEM_ICON_CHANGED, BIJI_ITEM (note));
}
static void
-_biji_note_book_add_one_item (BijiNoteBook *book, BijiItem *item)
+_biji_manager_add_one_item (BijiManager *manager, BijiItem *item)
{
g_return_if_fail (BIJI_IS_ITEM (item));
/* Add it to the list */
- g_hash_table_insert (book->priv->items,
+ g_hash_table_insert (manager->priv->items,
(gpointer) biji_item_get_uuid (item), item);
/* Notify */
if (BIJI_IS_NOTE_OBJ (item))
{
- g_signal_connect (item, "changed", G_CALLBACK (book_on_note_changed_cb), book);
- g_signal_connect (item, "renamed", G_CALLBACK (book_on_note_changed_cb), book);
- g_signal_connect (item, "color-changed", G_CALLBACK (book_on_item_icon_changed_cb), book);
+ g_signal_connect (item, "changed", G_CALLBACK (manager_on_note_changed_cb), manager);
+ g_signal_connect (item, "renamed", G_CALLBACK (manager_on_note_changed_cb), manager);
+ g_signal_connect (item, "color-changed", G_CALLBACK (manager_on_item_icon_changed_cb), manager);
}
else if (BIJI_IS_COLLECTION (item))
{
- g_signal_connect (item, "deleted", G_CALLBACK (on_item_deleted_cb), book);
- g_signal_connect (item , "icon-changed", G_CALLBACK (book_on_item_icon_changed_cb), book);
+ g_signal_connect (item, "deleted", G_CALLBACK (on_item_deleted_cb), manager);
+ g_signal_connect (item , "icon-changed", G_CALLBACK (manager_on_item_icon_changed_cb), manager);
}
}
@@ -329,7 +329,7 @@ _biji_note_book_add_one_item (BijiNoteBook *book, BijiItem *item)
static void
on_provider_loaded_cb (BijiProvider *provider,
GList *items,
- BijiNoteBook *book)
+ BijiManager *manager)
{
BijiItem *item = NULL;
GList *l;
@@ -340,7 +340,7 @@ on_provider_loaded_cb (BijiProvider *provider,
{
if (BIJI_IS_ITEM (l->data))
{
- _biji_note_book_add_one_item (book, l->data);
+ _biji_manager_add_one_item (manager, l->data);
i++;
}
}
@@ -353,18 +353,18 @@ on_provider_loaded_cb (BijiProvider *provider,
* because this might be the first provider.
* See #708458
* There are more performant fixes but not worth it */
- biji_note_book_notify_changed (book, BIJI_BOOK_MASS_CHANGE, item);
+ biji_manager_notify_changed (manager, BIJI_MANAGER_MASS_CHANGE, item);
}
/*
* It should be the right place
* to stock somehow providers list
- * in order to handle properly book__note_new ()
+ * in order to handle properly manager__note_new ()
*
*/
static void
-_add_provider (BijiNoteBook *self,
+_add_provider (BijiManager *self,
BijiProvider *provider)
{
g_return_if_fail (BIJI_IS_PROVIDER (provider));
@@ -383,7 +383,7 @@ _add_provider (BijiNoteBook *self,
void
-biji_note_book_add_goa_object (BijiNoteBook *self,
+biji_manager_add_goa_object (BijiManager *self,
GoaObject *object)
{
BijiProvider *provider;
@@ -406,17 +406,17 @@ biji_note_book_add_goa_object (BijiNoteBook *self,
static void
-biji_note_book_constructed (GObject *object)
+biji_manager_constructed (GObject *object)
{
- BijiNoteBook *self;
- BijiNoteBookPrivate *priv;
+ BijiManager *self;
+ BijiManagerPrivate *priv;
gchar *filename;
GFile *cache;
GError *error;
- G_OBJECT_CLASS (biji_note_book_parent_class)->constructed (object);
- self = BIJI_NOTE_BOOK (object);
+ G_OBJECT_CLASS (biji_manager_parent_class)->constructed (object);
+ self = BIJI_MANAGER (object);
priv = self->priv;
error = NULL;
@@ -452,16 +452,16 @@ biji_note_book_constructed (GObject *object)
static void
-biji_note_book_class_init (BijiNoteBookClass *klass)
+biji_manager_class_init (BijiManagerClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = biji_note_book_finalize;
- object_class->constructed = biji_note_book_constructed;
- object_class->set_property = biji_note_book_set_property;
- object_class->get_property = biji_note_book_get_property;
+ object_class->finalize = biji_manager_finalize;
+ object_class->constructed = biji_manager_constructed;
+ object_class->set_property = biji_manager_set_property;
+ object_class->get_property = biji_manager_get_property;
- biji_book_signals[BOOK_AMENDED] =
+ biji_manager_signals[BOOK_AMENDED] =
g_signal_new ("changed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST,
0, NULL, NULL, /* offset & accumulator */
_biji_marshal_VOID__ENUM_POINTER,
@@ -469,7 +469,7 @@ biji_note_book_class_init (BijiNoteBookClass *klass)
properties[PROP_LOCATION] =
g_param_spec_object ("location",
- "The book location",
+ "The manager location",
"The location where the notes are loaded and saved",
G_TYPE_FILE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
@@ -478,37 +478,37 @@ biji_note_book_class_init (BijiNoteBookClass *klass)
properties[PROP_COLOR] =
g_param_spec_pointer ("color",
"Default color",
- "Note book default color for notes",
+ "Note manager default color for notes",
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
properties[PROP_ERROR] =
g_param_spec_pointer ("error",
"Unrecoverable error",
- "Note book unrecoverable error",
+ "Note manager unrecoverable error",
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
- g_object_class_install_properties (object_class, BIJI_BOOK_PROPERTIES, properties);
- g_type_class_add_private (klass, sizeof (BijiNoteBookPrivate));
+ g_object_class_install_properties (object_class, BIJI_MANAGER_PROPERTIES, properties);
+ g_type_class_add_private (klass, sizeof (BijiManagerPrivate));
}
void
-biji_note_book_get_default_color (BijiNoteBook *book, GdkRGBA *color)
+biji_manager_get_default_color (BijiManager *manager, GdkRGBA *color)
{
- g_return_if_fail (BIJI_IS_NOTE_BOOK (book));
+ g_return_if_fail (BIJI_IS_MANAGER (manager));
- color->red = book->priv->color.red;
- color->blue = book->priv->color.blue;
- color->green = book->priv->color.green;
- color->alpha = book->priv->color.alpha;
+ color->red = manager->priv->color.red;
+ color->blue = manager->priv->color.blue;
+ color->green = manager->priv->color.green;
+ color->alpha = manager->priv->color.alpha;
}
gboolean
-biji_note_book_remove_item (BijiNoteBook *book, BijiItem *item)
+biji_manager_remove_item (BijiManager *manager, BijiItem *item)
{
- g_return_val_if_fail (BIJI_IS_NOTE_BOOK (book), FALSE);
+ g_return_val_if_fail (BIJI_IS_MANAGER (manager), FALSE);
g_return_val_if_fail (BIJI_IS_ITEM (item), FALSE);
BijiItem *to_delete = NULL;
@@ -516,15 +516,15 @@ biji_note_book_remove_item (BijiNoteBook *book, BijiItem *item)
gboolean retval = FALSE;
path = biji_item_get_uuid (item);
- to_delete = g_hash_table_lookup (book->priv->items, path);
+ to_delete = g_hash_table_lookup (manager->priv->items, path);
if (to_delete)
{
/* Signal before doing anything here. So the note is still
* fully available for signal receiver. */
- biji_note_book_notify_changed (book, BIJI_BOOK_ITEM_TRASHED, to_delete);
+ biji_manager_notify_changed (manager, BIJI_MANAGER_ITEM_TRASHED, to_delete);
biji_item_trash (item);
- g_hash_table_remove (book->priv->items, path);
+ g_hash_table_remove (manager->priv->items, path);
retval = TRUE;
}
@@ -533,9 +533,9 @@ biji_note_book_remove_item (BijiNoteBook *book, BijiItem *item)
}
gboolean
-biji_note_book_add_item (BijiNoteBook *book, BijiItem *item, gboolean notify)
+biji_manager_add_item (BijiManager *manager, BijiItem *item, gboolean notify)
{
- g_return_val_if_fail (BIJI_IS_NOTE_BOOK (book), FALSE);
+ g_return_val_if_fail (BIJI_IS_MANAGER (manager), FALSE);
g_return_val_if_fail (BIJI_IS_ITEM (item), FALSE);
const gchar *uid;
@@ -544,47 +544,47 @@ biji_note_book_add_item (BijiNoteBook *book, BijiItem *item, gboolean notify)
uid = biji_item_get_uuid (item);
if (uid != NULL &&
- g_hash_table_lookup (book->priv->items, uid))
+ g_hash_table_lookup (manager->priv->items, uid))
retval = FALSE;
else if (BIJI_IS_NOTE_OBJ (item))
- _biji_note_book_add_one_item (book, item);
+ _biji_manager_add_one_item (manager, item);
else if (BIJI_IS_COLLECTION (item))
{
- g_hash_table_insert (book->priv->items,
+ g_hash_table_insert (manager->priv->items,
(gpointer) biji_item_get_uuid (item),
item);
g_signal_connect (item, "deleted",
- G_CALLBACK (on_item_deleted_cb), book);
+ G_CALLBACK (on_item_deleted_cb), manager);
}
if (retval && notify)
- biji_note_book_notify_changed (book, BIJI_BOOK_ITEM_ADDED, item);
+ biji_manager_notify_changed (manager, BIJI_MANAGER_ITEM_ADDED, item);
return retval;
}
GList *
-biji_note_book_get_items (BijiNoteBook *book)
+biji_manager_get_items (BijiManager *manager)
{
- return g_hash_table_get_values (book->priv->items);
+ return g_hash_table_get_values (manager->priv->items);
}
BijiItem *
-biji_note_book_get_item_at_path (BijiNoteBook *book, const gchar *path)
+biji_manager_get_item_at_path (BijiManager *manager, const gchar *path)
{
- return g_hash_table_lookup (book->priv->items, (gconstpointer) path);
+ return g_hash_table_lookup (manager->priv->items, (gconstpointer) path);
}
-BijiNoteBook *
-biji_note_book_new (GFile *location, GdkRGBA *color, GError **error)
+BijiManager *
+biji_manager_new (GFile *location, GdkRGBA *color, GError **error)
{
- BijiNoteBook *retval;
+ BijiManager *retval;
- retval = g_object_new (BIJI_TYPE_NOTE_BOOK,
+ retval = g_object_new (BIJI_TYPE_MANAGER,
"location", location,
"color", color,
"error", *error,
@@ -596,7 +596,7 @@ biji_note_book_new (GFile *location, GdkRGBA *color, GError **error)
BijiNoteObj *
-biji_note_get_new_from_file (BijiNoteBook *book, const gchar* path)
+biji_note_get_new_from_file (BijiManager *manager, const gchar* path)
{
BijiInfoSet set;
BijiNoteObj *ret;
@@ -606,14 +606,14 @@ biji_note_get_new_from_file (BijiNoteBook *book, const gchar* path)
set.title = NULL;
set.content = NULL;
- ret = biji_local_note_new_from_info (book->priv->local_provider, book, &set);
+ ret = biji_local_note_new_from_info (manager->priv->local_provider, manager, &set);
biji_lazy_deserialize (ret);
return ret ;
}
gchar *
-biji_note_book_get_uuid (void)
+biji_manager_get_uuid (void)
{
uuid_t unique;
char out[40];
@@ -625,7 +625,7 @@ biji_note_book_get_uuid (void)
/* Common UUID skeleton for new notes. */
static BijiNoteObj *
-get_note_skeleton (BijiNoteBook *book)
+get_note_skeleton (BijiManager *manager)
{
BijiNoteObj *ret = NULL;
gchar * folder, *name, *path;
@@ -634,17 +634,17 @@ get_note_skeleton (BijiNoteBook *book)
set.title = NULL;
set.content = NULL;
set.mtime = 0;
- folder = g_file_get_path (book->priv->location);
+ folder = g_file_get_path (manager->priv->location);
while (!ret)
{
- name = biji_note_book_get_uuid ();
+ name = biji_manager_get_uuid ();
path = g_build_filename (folder, name, NULL);
g_free (name);
set.url = path;
- if (!g_hash_table_lookup (book->priv->items, path))
- ret = biji_local_note_new_from_info (book->priv->local_provider, book, &set);
+ if (!g_hash_table_lookup (manager->priv->items, path))
+ ret = biji_local_note_new_from_info (manager->priv->local_provider, manager, &set);
g_free (path);
}
@@ -658,15 +658,15 @@ get_note_skeleton (BijiNoteBook *book)
* TODO : move this to local provider.
*/
static BijiNoteObj *
-biji_note_book_local_note_new (BijiNoteBook *book, gchar *str)
+biji_manager_local_note_new (BijiManager *manager, gchar *str)
{
- BijiNoteObj *ret = get_note_skeleton (book);
+ BijiNoteObj *ret = get_note_skeleton (manager);
if (str)
{
gchar *unique, *html;
- unique = biji_note_book_get_unique_title (book, str);
+ unique = biji_manager_get_unique_title (manager, str);
html = html_from_plain_text (str);
biji_note_obj_set_title (ret, unique);
@@ -678,7 +678,7 @@ biji_note_book_local_note_new (BijiNoteBook *book, gchar *str)
}
biji_note_obj_save_note (ret);
- biji_note_book_add_item (book, BIJI_ITEM (ret), TRUE);
+ biji_manager_add_item (manager, BIJI_ITEM (ret), TRUE);
return ret;
}
@@ -689,15 +689,15 @@ biji_note_book_local_note_new (BijiNoteBook *book, gchar *str)
* for emiting the signal transfering the notes
* And no need to _add_provider, it's a tmp provider. */
void
-biji_note_book_import_uri (BijiNoteBook *book,
+biji_manager_import_uri (BijiManager *manager,
gchar *target_provider_id,
gchar *uri)
{
BijiProvider *ret;
- ret = biji_import_provider_new (book, target_provider_id, uri);
+ ret = biji_import_provider_new (manager, target_provider_id, uri);
g_signal_connect (ret, "loaded",
- G_CALLBACK (on_provider_loaded_cb), book);
+ G_CALLBACK (on_provider_loaded_cb), manager);
}
@@ -706,7 +706,7 @@ biji_note_book_import_uri (BijiNoteBook *book,
* Use goa_account_get_id for goa
*/
BijiNoteObj *
-biji_note_book_note_new (BijiNoteBook *book,
+biji_manager_note_new (BijiManager *manager,
gchar *str,
gchar *provider_id)
{
@@ -718,17 +718,17 @@ biji_note_book_note_new (BijiNoteBook *book,
if (provider_id == NULL ||
g_strcmp0 (provider_id, "local") == 0)
- return biji_note_book_local_note_new (book, str);
+ return biji_manager_local_note_new (manager, str);
- provider = g_hash_table_lookup (book->priv->providers,
+ provider = g_hash_table_lookup (manager->priv->providers,
provider_id);
retval = BIJI_PROVIDER_GET_CLASS (provider)->create_new_note (provider, str);
// do not save. up to the provider implementation to save it or not
// at creation.
- biji_note_book_add_item (book, BIJI_ITEM (retval), TRUE);
+ biji_manager_add_item (manager, BIJI_ITEM (retval), TRUE);
return retval;
}
@@ -737,7 +737,7 @@ biji_note_book_note_new (BijiNoteBook *book,
BijiNoteObj *
-biji_note_book_note_new_full (BijiNoteBook *book,
+biji_manager_note_new_full (BijiManager *manager,
gchar *provider_id,
gchar *suggested_path,
BijiInfoSet *info,
@@ -747,7 +747,7 @@ biji_note_book_note_new_full (BijiNoteBook *book,
BijiProvider *provider;
BijiNoteObj *retval;
- provider = g_hash_table_lookup (book->priv->providers,
+ provider = g_hash_table_lookup (manager->priv->providers,
provider_id);
retval = BIJI_PROVIDER_GET_CLASS (provider)->create_note_full (provider,
diff --git a/src/libbiji/biji-manager.h b/src/libbiji/biji-manager.h
new file mode 100644
index 0000000..33982de
--- /dev/null
+++ b/src/libbiji/biji-manager.h
@@ -0,0 +1,137 @@
+#ifndef _BIJI_MANAGER_H_
+#define _BIJI_MANAGER_H_
+
+#include <glib-object.h>
+#include <tracker-sparql.h>
+
+#if BUILD_ZEIGEIST
+#include <zeitgeist.h>
+#endif /* BUILD_ZEIGEIST */
+
+#include "biji-info-set.h"
+#include "biji-note-obj.h"
+
+#define GOA_API_IS_SUBJECT_TO_CHANGE
+#include <goa/goa.h>
+
+G_BEGIN_DECLS
+
+/* The flag tells if view should reload the whole model or not */
+typedef enum
+{
+ BIJI_MANAGER_CHANGE_FLAG,
+ BIJI_MANAGER_MASS_CHANGE, // Startup, mass import.. rather rebuild the whole.
+ BIJI_MANAGER_ITEM_ADDED, // Single item added
+ BIJI_MANAGER_ITEM_TRASHED, // Single item trashed
+ BIJI_MANAGER_ITEM_ICON_CHANGED, // Single item icon
+ BIJI_MANAGER_NOTE_AMENDED, // Single note amended (title, content)
+} BijiManagerChangeFlag;
+
+#define BIJI_TYPE_MANAGER (biji_manager_get_type ())
+#define BIJI_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), BIJI_TYPE_MANAGER, BijiManager))
+#define BIJI_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), BIJI_TYPE_MANAGER,
BijiManagerClass))
+#define BIJI_IS_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BIJI_TYPE_MANAGER))
+#define BIJI_IS_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BIJI_TYPE_MANAGER))
+#define BIJI_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), BIJI_TYPE_MANAGER,
BijiManagerClass))
+
+typedef struct _BijiManagerClass BijiManagerClass;
+typedef struct _BijiManager BijiManager;
+
+typedef struct _BijiManagerPrivate BijiManagerPrivate;
+
+struct _BijiManagerClass
+{
+ GObjectClass parent_class;
+};
+
+struct _BijiManager
+{
+ GObject parent_instance;
+ BijiManagerPrivate *priv ;
+};
+
+
+
+GType biji_manager_get_type (void) G_GNUC_CONST;
+
+
+
+BijiManager *biji_manager_new (GFile *location,
+ GdkRGBA *color,
+ GError **error);
+
+
+void biji_manager_import_uri (BijiManager *manager,
+ gchar *target_provider_id,
+ gchar *uri);
+
+
+void biji_manager_add_goa_object (BijiManager *manager,
+ GoaObject *object);
+
+/* <ProviderInfo*> */
+GList *biji_manager_get_providers (BijiManager *manager);
+
+
+#if have_zeitgeist
+ZeitgeistLog *biji_manager_get_zg_log (BijiManager *manager);
+#endif /* have_zeitgeist */
+
+TrackerSparqlConnection
+ *biji_manager_get_tracker_connection (BijiManager *manager);
+
+
+void biji_manager_get_default_color (BijiManager *manager,
+ GdkRGBA *color);
+
+
+gchar *biji_manager_get_unique_title (BijiManager *manager,
+ const gchar *title);
+
+
+gboolean biji_manager_add_item (BijiManager *manager,
+ BijiItem *item,
+ gboolean notify);
+
+
+void biji_manager_notify_changed (BijiManager *manager,
+ BijiManagerChangeFlag flag,
+ BijiItem *item);
+
+
+gboolean biji_manager_remove_item (BijiManager *manager,
+ BijiItem *item);
+
+
+BijiItem *biji_manager_get_item_at_path (BijiManager *manager,
+ const gchar *path);
+
+
+/* Get all items, either notes or collections
+ * Free the GList, not its content */
+GList *biji_manager_get_items (BijiManager *manager);
+
+
+
+// deprecated - instead we'll use new import / providers facilities
+BijiNoteObj *biji_note_get_new_from_file (BijiManager *manager,
+ const gchar* tomboy_format_note_path);
+
+
+
+BijiNoteObj *biji_manager_note_new (BijiManager *manager,
+ gchar *str,
+ gchar *provider_id);
+
+
+BijiNoteObj *biji_manager_note_new_full (BijiManager *manager,
+ gchar *provider_id,
+ gchar *suggested_path,
+ BijiInfoSet *info,
+ gchar *html,
+ GdkRGBA *color);
+
+
+G_END_DECLS
+
+#endif /* _BIJI_MANAGER_H_ */
diff --git a/src/libbiji/biji-note-obj.c b/src/libbiji/biji-note-obj.c
index 0aa97b5..d84add7 100644
--- a/src/libbiji/biji-note-obj.c
+++ b/src/libbiji/biji-note-obj.c
@@ -17,7 +17,7 @@
#include "biji-date-time.h"
#include "biji-note-id.h"
-#include "biji-note-book.h"
+#include "biji-manager.h"
#include "biji-note-obj.h"
#include "biji-timeout.h"
#include "biji-tracker.h"
@@ -177,7 +177,7 @@ enum {
static guint biji_obj_signals [BIJI_OBJ_SIGNALS] = { 0 };
/* we do NOT deserialize here. it might be a brand new note
- * it's up the book to ask .note to be read*/
+ * it's up the manager to ask .note to be read*/
static void
biji_note_obj_constructed (GObject *obj)
{
@@ -315,8 +315,8 @@ biji_note_obj_set_title (BijiNoteObj *note, const gchar *proposed_title)
}
- title = biji_note_book_get_unique_title (
- biji_item_get_book (BIJI_ITEM (note)), proposed_title);
+ title = biji_manager_get_unique_title (
+ biji_item_get_manager (BIJI_ITEM (note)), proposed_title);
biji_note_id_set_last_metadata_change_date (note->priv->id,
g_get_real_time () / G_USEC_PER_SEC);
@@ -843,11 +843,11 @@ _biji_note_obj_close (BijiNoteObj *note)
{
BijiNoteObjPrivate *priv;
BijiItem *item;
- BijiNoteBook *book;
+ BijiManager *manager;
priv = note->priv;
item = BIJI_ITEM (note);
- book = biji_item_get_book (BIJI_ITEM (note));
+ manager = biji_item_get_manager (BIJI_ITEM (note));
priv->editor = NULL;
#ifdef BUILD_ZEITGEIST
@@ -855,10 +855,10 @@ _biji_note_obj_close (BijiNoteObj *note)
#endif /* BUILD_ZEITGEIST */
/* Delete if note is totaly blank
- * Actually we just need to remove it from book
+ * Actually we just need to remove it from manager
* since no change could trigger save */
if (biji_note_id_get_content (priv->id) == NULL)
- biji_note_book_remove_item (book, item);
+ biji_manager_remove_item (manager, item);
}
GtkWidget *
diff --git a/src/libbiji/biji-tracker.c b/src/libbiji/biji-tracker.c
index 3e4f437..9a7b42a 100644
--- a/src/libbiji/biji-tracker.c
+++ b/src/libbiji/biji-tracker.c
@@ -37,7 +37,7 @@ typedef enum
* TODO : implemet this with GObject */
typedef struct {
- BijiNoteBook *book;
+ BijiManager *manager;
/* usually a query */
@@ -63,7 +63,7 @@ typedef struct {
static BijiTrackerFinisher *
-biji_tracker_finisher_new (BijiNoteBook *book,
+biji_tracker_finisher_new (BijiManager *manager,
gchar *str,
BijiInfoSet *info,
BijiBoolCallback bool_cb,
@@ -75,7 +75,7 @@ biji_tracker_finisher_new (BijiNoteBook *book,
{
BijiTrackerFinisher *retval = g_slice_new (BijiTrackerFinisher);
- retval->book = book;
+ retval->manager = manager;
retval->str = str;
retval->info = info;
retval->bool_cb = bool_cb;
@@ -100,9 +100,9 @@ biji_tracker_finisher_free (BijiTrackerFinisher *f)
static TrackerSparqlConnection*
-get_connection (BijiNoteBook *book)
+get_connection (BijiManager *manager)
{
- return biji_note_book_get_tracker_connection (book);
+ return biji_manager_get_tracker_connection (manager);
}
@@ -285,7 +285,7 @@ biji_query_items_list_finish (GObject *source_object,
path = g_strdup (full_path);
}
- item = biji_note_book_get_item_at_path (finisher->book, path);
+ item = biji_manager_get_item_at_path (finisher->manager, path);
/* Sorting is done in another place */
if (item)
@@ -302,7 +302,7 @@ biji_query_items_list_finish (GObject *source_object,
static void
-bjb_query_async (BijiNoteBook *book,
+bjb_query_async (BijiManager *manager,
gchar *query,
BijiInfoSetsHCallback hash_cb,
BijiItemsListCallback list_cb,
@@ -311,7 +311,7 @@ bjb_query_async (BijiNoteBook *book,
BijiTrackerFinisher *finisher;
GAsyncReadyCallback callback = NULL;
- finisher = biji_tracker_finisher_new (book, NULL, NULL, NULL, NULL, NULL, list_cb, hash_cb, user_data);
+ finisher = biji_tracker_finisher_new (manager, NULL, NULL, NULL, NULL, NULL, list_cb, hash_cb, user_data);
if (hash_cb != NULL)
callback = biji_query_info_hash_finish;
@@ -321,12 +321,12 @@ bjb_query_async (BijiNoteBook *book,
if (callback)
tracker_sparql_connection_query_async (
- get_connection (book), query, NULL, callback, finisher);
+ get_connection (manager), query, NULL, callback, finisher);
}
void
-biji_get_all_collections_async (BijiNoteBook *book,
+biji_get_all_collections_async (BijiManager *manager,
BijiInfoSetsHCallback cb,
gpointer user_data)
{
@@ -338,7 +338,7 @@ biji_get_all_collections_async (BijiNoteBook *book,
"nie:generator 'Bijiben'}",
NULL);
- bjb_query_async (book, query, cb, NULL, user_data);
+ bjb_query_async (manager, query, cb, NULL, user_data);
}
@@ -347,7 +347,7 @@ biji_get_all_collections_async (BijiNoteBook *book,
/* FIXME: returns file://$PATH while we want $PATH
* workaround in biji_query_items_list_finish */
void
-biji_get_items_with_collection_async (BijiNoteBook *book,
+biji_get_items_with_collection_async (BijiManager *manager,
const gchar *collection,
BijiItemsListCallback list_cb,
gpointer user_data)
@@ -357,14 +357,14 @@ biji_get_items_with_collection_async (BijiNoteBook *book,
query = g_strdup_printf ("SELECT ?s WHERE {?c nie:isPartOf ?s; nie:title '%s'}",
collection);
- bjb_query_async (book, query, NULL, list_cb, user_data);
+ bjb_query_async (manager, query, NULL, list_cb, user_data);
}
void
-biji_get_items_matching_async (BijiNoteBook *book,
+biji_get_items_matching_async (BijiManager *manager,
gchar *needle,
BijiItemsListCallback list_cb,
gpointer user_data)
@@ -400,7 +400,7 @@ biji_get_items_matching_async (BijiNoteBook *book,
NULL);
g_free (lower);
- bjb_query_async (book, query, NULL, list_cb, user_data);
+ bjb_query_async (manager, query, NULL, list_cb, user_data);
}
@@ -451,15 +451,15 @@ on_new_collection_query_executed (GObject *source_object, GAsyncResult *res, gpo
if (g_strcmp0 (key, "res") == 0)
urn = val;
- /* Update the note book */
+ /* Update the note manager */
if (urn)
{
collection = biji_collection_new (
- G_OBJECT (finisher->book),
+ G_OBJECT (finisher->manager),
urn,
finisher->str,
g_get_real_time () / G_USEC_PER_SEC);
- biji_note_book_add_item (finisher->book, BIJI_ITEM (collection), TRUE);
+ biji_manager_add_item (finisher->manager, BIJI_ITEM (collection), TRUE);
}
/* Run the callback from the caller */
@@ -475,10 +475,10 @@ on_new_collection_query_executed (GObject *source_object, GAsyncResult *res, gpo
/* This func creates the collection,
- * gives the urn to the notebook,
+ * gives the urn to the notemanager,
* then run the 'afterward' callback */
void
-biji_create_new_collection_async (BijiNoteBook *book,
+biji_create_new_collection_async (BijiManager *manager,
const gchar *name,
BijiItemCallback item_cb,
gpointer user_data)
@@ -504,8 +504,8 @@ biji_create_new_collection_async (BijiNoteBook *book,
/* The finisher has all the pointers we want.
* And the callback will free it */
- finisher = biji_tracker_finisher_new (book, g_strdup (name), NULL, NULL, NULL, item_cb, NULL, NULL,
user_data);
- tracker_sparql_connection_update_blank_async (get_connection (book),
+ finisher = biji_tracker_finisher_new (manager, g_strdup (name), NULL, NULL, NULL, item_cb, NULL, NULL,
user_data);
+ tracker_sparql_connection_update_blank_async (get_connection (manager),
query,
G_PRIORITY_DEFAULT,
NULL,
@@ -517,12 +517,12 @@ biji_create_new_collection_async (BijiNoteBook *book,
/* removes the tag EVEN if files associated. */
void
-biji_remove_collection_from_tracker (BijiNoteBook *book, const gchar *urn)
+biji_remove_collection_from_tracker (BijiManager *manager, const gchar *urn)
{
gchar *query;
query = g_strdup_printf ("DELETE {'%s' a nfo:DataContainer}", urn);
- biji_perform_update_async_and_free (get_connection (book), query, NULL, NULL);
+ biji_perform_update_async_and_free (get_connection (manager), query, NULL, NULL);
}
@@ -539,7 +539,7 @@ biji_push_existing_collection_to_note (BijiNoteObj *note,
url, title);
biji_perform_update_async_and_free (
- get_connection (biji_item_get_book (BIJI_ITEM (note))), query, afterward, user_data);
+ get_connection (biji_item_get_manager (BIJI_ITEM (note))), query, afterward, user_data);
g_free (url);
}
@@ -560,7 +560,7 @@ biji_remove_collection_from_note (BijiNoteObj *note,
biji_item_get_uuid (coll), url);
- biji_perform_update_async_and_free (get_connection (biji_item_get_book (coll)), query, afterward,
user_data);
+ biji_perform_update_async_and_free (get_connection (biji_item_get_manager (coll)), query, afterward,
user_data);
g_free (url);
}
@@ -571,37 +571,37 @@ biji_note_delete_from_tracker (BijiNoteObj *note)
BijiItem *item;
gchar *query;
const gchar *uuid;
- BijiNoteBook *book;
+ BijiManager *manager;
item = BIJI_ITEM (note);
- book = biji_item_get_book (item);
+ manager = biji_item_get_manager (item);
uuid = biji_item_get_uuid (item);
query = g_strdup_printf ("DELETE { <%s> a rdfs:Resource }", uuid);
- biji_perform_update_async_and_free (get_connection (book), query, NULL, NULL);
+ biji_perform_update_async_and_free (get_connection (manager), query, NULL, NULL);
}
void
-biji_tracker_trash_ressource (BijiNoteBook *book,
+biji_tracker_trash_ressource (BijiManager *manager,
gchar *tracker_urn)
{
gchar *query;
query = g_strdup_printf ("DELETE { <%s> a rdfs:Resource }", tracker_urn);
- biji_perform_update_async_and_free (get_connection (book), query, NULL, NULL);
+ biji_perform_update_async_and_free (get_connection (manager), query, NULL, NULL);
}
static void
update_ressource (BijiTrackerFinisher *finisher, gchar *tracker_urn_uuid )
{
- BijiNoteBook *book;
+ BijiManager *manager;
BijiInfoSet *info;
gchar *query, *created, *mtime, *content;
GTimeVal t;
- book = finisher->book;
+ manager = finisher->manager;
info = finisher->info;
t.tv_usec = 0;
@@ -633,7 +633,7 @@ update_ressource (BijiTrackerFinisher *finisher, gchar *tracker_urn_uuid )
content,
info->datasource_urn);
- biji_perform_update_async_and_free (get_connection (book), query, NULL, NULL);
+ biji_perform_update_async_and_free (get_connection (manager), query, NULL, NULL);
g_free (tracker_urn_uuid);
g_free (mtime);
@@ -646,12 +646,12 @@ update_ressource (BijiTrackerFinisher *finisher, gchar *tracker_urn_uuid )
static void
push_new_note (BijiTrackerFinisher *finisher)
{
- BijiNoteBook *book;
+ BijiManager *manager;
BijiInfoSet *info;
gchar *query, *content, *created_time, *mtime;
GTimeVal t;
- book = finisher->book;
+ manager = finisher->manager;
info = finisher->info;
g_message ("Creating ressource <%s> %s", info->title, info->url);
@@ -680,7 +680,7 @@ push_new_note (BijiTrackerFinisher *finisher)
g_debug ("%s", query);
- tracker_sparql_connection_update_blank_async (get_connection (book),
+ tracker_sparql_connection_update_blank_async (get_connection (manager),
query,
G_PRIORITY_DEFAULT,
NULL,
@@ -744,7 +744,7 @@ ensure_ressource_callback (GObject *source_object,
void
-biji_tracker_ensure_ressource_from_info (BijiNoteBook *book,
+biji_tracker_ensure_ressource_from_info (BijiManager *manager,
BijiInfoSet *info)
{
gchar *query;
@@ -763,7 +763,7 @@ biji_tracker_ensure_ressource_from_info (BijiNoteBook *book,
* we'll need our own to push if needed */
finisher = biji_tracker_finisher_new (
- book,
+ manager,
NULL,
info,
NULL,
@@ -774,7 +774,7 @@ biji_tracker_ensure_ressource_from_info (BijiNoteBook *book,
NULL); // user_data);
tracker_sparql_connection_query_async (
- get_connection (book), query, NULL, ensure_ressource_callback, finisher);
+ get_connection (manager), query, NULL, ensure_ressource_callback, finisher);
}
@@ -782,7 +782,7 @@ biji_tracker_ensure_ressource_from_info (BijiNoteBook *book,
void
-biji_tracker_ensure_datasource (BijiNoteBook *book,
+biji_tracker_ensure_datasource (BijiManager *manager,
const gchar *datasource,
const gchar *identifier,
BijiBoolCallback cb,
@@ -799,7 +799,7 @@ biji_tracker_ensure_datasource (BijiNoteBook *book,
identifier);
biji_perform_update_async_and_free (
- get_connection (book), query, cb, user_data);
+ get_connection (manager), query, cb, user_data);
}
@@ -872,7 +872,7 @@ on_info_queried (GObject *source_object,
void
-biji_tracker_check_for_info (BijiNoteBook *book,
+biji_tracker_check_for_info (BijiManager *manager,
gchar *url,
gint64 mtime,
BijiInfoCallback callback,
@@ -899,7 +899,7 @@ biji_tracker_check_for_info (BijiNoteBook *book,
info->mtime = mtime;
finisher = biji_tracker_finisher_new (
- book,
+ manager,
NULL,
info,
NULL,
@@ -910,7 +910,7 @@ biji_tracker_check_for_info (BijiNoteBook *book,
user_data);
tracker_sparql_connection_query_async (
- get_connection (book), query, NULL, on_info_queried, finisher);
+ get_connection (manager), query, NULL, on_info_queried, finisher);
g_free (query);
diff --git a/src/libbiji/biji-tracker.h b/src/libbiji/biji-tracker.h
index 756e7a2..88557ec 100644
--- a/src/libbiji/biji-tracker.h
+++ b/src/libbiji/biji-tracker.h
@@ -48,33 +48,33 @@ typedef void (*BijiInfoCallback) (BijiInfoSet *info, gpointer use
-void biji_get_items_with_collection_async (BijiNoteBook *book,
+void biji_get_items_with_collection_async (BijiManager *manager,
const gchar *needle,
BijiItemsListCallback cb,
gpointer user_data);
-void biji_get_items_matching_async (BijiNoteBook *book,
+void biji_get_items_matching_async (BijiManager *manager,
gchar *needle,
BijiItemsListCallback cb,
gpointer user_data);
-void biji_get_all_collections_async (BijiNoteBook *book,
+void biji_get_all_collections_async (BijiManager *manager,
BijiInfoSetsHCallback cb,
gpointer user_data);
-void biji_create_new_collection_async (BijiNoteBook *book,
+void biji_create_new_collection_async (BijiManager *manager,
const gchar *tag,
BijiItemCallback afterward,
gpointer user_data);
-void biji_remove_collection_from_tracker (BijiNoteBook *book,
+void biji_remove_collection_from_tracker (BijiManager *manager,
const gchar *urn);
@@ -97,22 +97,22 @@ void biji_remove_collection_from_note (BijiNoteObj *note,
void biji_note_delete_from_tracker (BijiNoteObj *note);
-void biji_tracker_trash_ressource (BijiNoteBook *book,
+void biji_tracker_trash_ressource (BijiManager *manager,
gchar *tracker_urn);
-void biji_tracker_ensure_ressource_from_info (BijiNoteBook *book,
+void biji_tracker_ensure_ressource_from_info (BijiManager *manager,
BijiInfoSet *info);
-void biji_tracker_ensure_datasource (BijiNoteBook *book,
+void biji_tracker_ensure_datasource (BijiManager *manager,
const gchar *datasource_id,
const gchar *identifier,
BijiBoolCallback cb,
gpointer user_data);
-void biji_tracker_check_for_info (BijiNoteBook *book,
+void biji_tracker_check_for_info (BijiManager *manager,
gchar *url,
gint64 mtime,
BijiInfoCallback callback,
diff --git a/src/libbiji/biji-zeitgeist.c b/src/libbiji/biji-zeitgeist.c
index c153894..34c71fa 100644
--- a/src/libbiji/biji-zeitgeist.c
+++ b/src/libbiji/biji-zeitgeist.c
@@ -18,6 +18,7 @@
#ifdef BUILD_ZEITGEIST
#include <libbiji.h>
+#include "biji-manager.h"
#include "biji-zeitgeist.h"
@@ -89,7 +90,7 @@ check_insert_create_zeitgeist (BijiNoteObj *note)
ZeitgeistSubject *subject;
uri = g_strdup_printf ("file://%s", biji_item_get_uuid (BIJI_ITEM (note)));
- log = biji_note_book_get_zg_log (biji_item_get_book (BIJI_ITEM (note)));
+ log = biji_manager_get_zg_log (biji_item_get_manager (BIJI_ITEM (note)));
templates = g_ptr_array_new ();
event = zeitgeist_event_new_full (ZEITGEIST_ZG_CREATE_EVENT,
@@ -135,7 +136,7 @@ insert_zeitgeist (BijiNoteObj *note,
/* Insert requested log */
- log = biji_note_book_get_zg_log (biji_item_get_book (BIJI_ITEM (note)));
+ log = biji_manager_get_zg_log (biji_item_get_manager (BIJI_ITEM (note)));
uri = g_strdup_printf ("file://%s", biji_item_get_uuid (BIJI_ITEM (note)));
subject = zeitgeist_subject_new_full (uri,
diff --git a/src/libbiji/editor/biji-webkit-editor.c b/src/libbiji/editor/biji-webkit-editor.c
index e658fd6..b47f313 100644
--- a/src/libbiji/editor/biji-webkit-editor.c
+++ b/src/libbiji/editor/biji-webkit-editor.c
@@ -19,7 +19,7 @@
#include "config.h"
#include "../biji-string.h"
-#include "../biji-note-book.h"
+#include "../biji-manager.h"
#include "biji-webkit-editor.h"
#include "biji-editor-selection.h"
@@ -279,7 +279,7 @@ on_content_changed (WebKitWebView *view)
if (g_strcmp0 (title, biji_item_get_title (BIJI_ITEM (note))) != 0)
{
- unique_title = biji_note_book_get_unique_title (biji_item_get_book (BIJI_ITEM (note)),
+ unique_title = biji_manager_get_unique_title (biji_item_get_manager (BIJI_ITEM (note)),
title);
biji_note_obj_set_title (note, unique_title);
diff --git a/src/libbiji/libbiji.h b/src/libbiji/libbiji.h
index 78955bb..eb250ac 100644
--- a/src/libbiji/libbiji.h
+++ b/src/libbiji/libbiji.h
@@ -25,7 +25,7 @@
#include "biji-date-time.h"
#include "biji-item.h"
#include "biji-marshalers.h"
-#include "biji-note-book.h"
+#include "biji-manager.h"
#include "biji-note-obj.h"
#include "biji-string.h"
#include "biji-tracker.h"
diff --git a/src/libbiji/provider/biji-import-provider.c b/src/libbiji/provider/biji-import-provider.c
index 8d61d81..f5578bc 100644
--- a/src/libbiji/provider/biji-import-provider.c
+++ b/src/libbiji/provider/biji-import-provider.c
@@ -46,7 +46,7 @@ struct BijiImportProviderPrivate_
BijiProviderInfo info;
gchar *uri;
gchar *target; // the provider to import to
- GHashTable *items; // same as book, notes key=path, coll key = name.
+ GHashTable *items; // same as manager, notes key=path, coll key = name.
};
@@ -71,11 +71,11 @@ instanciate_note (BijiImportProvider *self, GFileInfo *info, GFile *container)
const gchar *name;
gchar *path;
GdkRGBA *color;
- BijiNoteBook *book;
+ BijiManager *manager;
retval = NULL;
- book = biji_provider_get_book (BIJI_PROVIDER (self));
+ manager = biji_provider_get_manager (BIJI_PROVIDER (self));
/* First make sure it's a note */
name = g_file_info_get_name (info);
@@ -114,8 +114,8 @@ instanciate_note (BijiImportProvider *self, GFileInfo *info, GFile *container)
/* Create the note w/ default color */
color = g_new0 (GdkRGBA, 1);
- biji_note_book_get_default_color (book, color);
- retval = biji_note_book_note_new_full (book,
+ biji_manager_get_default_color (manager, color);
+ retval = biji_manager_note_new_full (manager,
self->priv->target,
g_strdup (g_file_info_get_name (info)),
set,
@@ -358,10 +358,10 @@ biji_import_provider_init (BijiImportProvider *self)
BijiProvider *
-biji_import_provider_new (BijiNoteBook *b, gchar *target_provider, gchar *uri)
+biji_import_provider_new (BijiManager *b, gchar *target_provider, gchar *uri)
{
return g_object_new (BIJI_TYPE_IMPORT_PROVIDER,
- "book", b,
+ "manager", b,
"target", target_provider,
"uri", uri,
NULL);
diff --git a/src/libbiji/provider/biji-import-provider.h b/src/libbiji/provider/biji-import-provider.h
index 3ed867f..c622462 100644
--- a/src/libbiji/provider/biji-import-provider.h
+++ b/src/libbiji/provider/biji-import-provider.h
@@ -26,14 +26,14 @@
* it kills its own ref.
*/
-/* As of today this is the direct class to be used by notebook.
- * Later on book might use different importProviders sub-classes */
+/* As of today this is the direct class to be used by notemanager.
+ * Later on manager might use different importProviders sub-classes */
#ifndef BIJI_IMPORT_PROVIDER_H_
#define BIJI_IMPORT_PROVIDER_H_ 1
-#include "../biji-note-book.h"
+#include "../biji-manager.h"
#include "biji-provider.h"
G_BEGIN_DECLS
@@ -65,7 +65,7 @@ struct BijiImportProviderClass_
GType biji_import_provider_get_type (void);
-BijiProvider *biji_import_provider_new (BijiNoteBook *book,
+BijiProvider *biji_import_provider_new (BijiManager *manager,
gchar *target_provider,
gchar *uri);
diff --git a/src/libbiji/provider/biji-local-provider.c b/src/libbiji/provider/biji-local-provider.c
index ad7200a..8512674 100644
--- a/src/libbiji/provider/biji-local-provider.c
+++ b/src/libbiji/provider/biji-local-provider.c
@@ -95,17 +95,17 @@ create_collection_if_needed (gpointer key,
BijiLocalProvider *self;
BijiInfoSet *set;
BijiCollection *collection;
- BijiNoteBook *book;
+ BijiManager *manager;
self = user_data;
set = value;
collection = g_hash_table_lookup (self->priv->items, key);
- book = biji_provider_get_book (BIJI_PROVIDER (self));
+ manager = biji_provider_get_manager (BIJI_PROVIDER (self));
if (!collection)
{
- collection = biji_collection_new (G_OBJECT (book), key, set->title, set->mtime);
+ collection = biji_collection_new (G_OBJECT (manager), key, set->title, set->mtime);
g_hash_table_insert (self->priv->items,
g_strdup (key),
@@ -184,7 +184,7 @@ enumerate_next_files_ready_cb (GObject *source,
note = biji_local_note_new_from_info (BIJI_PROVIDER (self),
- biji_provider_get_book (BIJI_PROVIDER (self)),
+ biji_provider_get_manager (BIJI_PROVIDER (self)),
&info);
biji_lazy_deserialize (note);
@@ -199,7 +199,7 @@ enumerate_next_files_ready_cb (GObject *source,
/* Now we have all notes,
* load the collections and we're good to notify loading done */
- biji_get_all_collections_async (biji_provider_get_book (BIJI_PROVIDER (self)),
+ biji_get_all_collections_async (biji_provider_get_manager (BIJI_PROVIDER (self)),
local_provider_finish,
self);
}
@@ -327,7 +327,7 @@ local_prov_create_note_full (BijiProvider *provider,
/* RAW NOTE */
retval = biji_local_note_new_from_info (provider,
- biji_provider_get_book (provider),
+ biji_provider_get_manager (provider),
info);
/* EXTRAS */
@@ -409,7 +409,7 @@ biji_local_provider_class_init (BijiLocalProviderClass *klass)
properties[PROP_LOCATION] =
g_param_spec_object ("location",
- "The book location",
+ "The manager location",
"The location where the notes are loaded and saved",
G_TYPE_FILE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
@@ -421,11 +421,11 @@ biji_local_provider_class_init (BijiLocalProviderClass *klass)
BijiProvider *
-biji_local_provider_new (BijiNoteBook *book,
+biji_local_provider_new (BijiManager *manager,
GFile *location)
{
return g_object_new (BIJI_TYPE_LOCAL_PROVIDER,
- "book", book,
+ "manager", manager,
"location", location,
NULL);
}
diff --git a/src/libbiji/provider/biji-local-provider.h b/src/libbiji/provider/biji-local-provider.h
index dc3baec..894ee1c 100644
--- a/src/libbiji/provider/biji-local-provider.h
+++ b/src/libbiji/provider/biji-local-provider.h
@@ -22,7 +22,7 @@
#define BIJI_LOCAL_PROVIDER_H_ 1
-#include "../biji-note-book.h"
+#include "../biji-manager.h"
#include "biji-provider.h"
@@ -57,7 +57,7 @@ struct BijiLocalProviderClass_
GType biji_local_provider_get_type (void);
-BijiProvider *biji_local_provider_new (BijiNoteBook *book,
+BijiProvider *biji_local_provider_new (BijiManager *manager,
GFile *location);
diff --git a/src/libbiji/provider/biji-own-cloud-note.c b/src/libbiji/provider/biji-own-cloud-note.c
index 1fd5a23..cee121c 100644
--- a/src/libbiji/provider/biji-own-cloud-note.c
+++ b/src/libbiji/provider/biji-own-cloud-note.c
@@ -138,13 +138,13 @@ ocloud_note_ensure_ressource (BijiNoteObj *note)
info->created = biji_note_obj_get_create_date (note);
info->datasource_urn = g_strdup (provider->datasource);
- biji_tracker_ensure_ressource_from_info (biji_item_get_book (item),
+ biji_tracker_ensure_ressource_from_info (biji_item_get_manager (item),
info);
}
/* TODO: propagate error if any
- * through generic provider -> book */
+ * through generic provider -> manager */
void
on_content_replaced (GObject *source_object,
GAsyncResult *res,
@@ -371,7 +371,7 @@ biji_own_cloud_note_class_init (BijiOwnCloudNoteClass *klass)
BijiNoteObj *biji_own_cloud_note_new_from_info (BijiOwnCloudProvider *prov,
- BijiNoteBook *book,
+ BijiManager *manager,
BijiInfoSet *info)
{
BijiNoteID *id;
@@ -406,7 +406,7 @@ BijiNoteObj *biji_own_cloud_note_new_from_info (BijiOwnCloudPro
id = biji_note_id_new_from_info (info);
retval = g_object_new (BIJI_TYPE_OWN_CLOUD_NOTE,
- "note-book", book,
+ "manager", manager,
"id", id,
NULL);
diff --git a/src/libbiji/provider/biji-own-cloud-note.h b/src/libbiji/provider/biji-own-cloud-note.h
index ccad0de..178ce69 100644
--- a/src/libbiji/provider/biji-own-cloud-note.h
+++ b/src/libbiji/provider/biji-own-cloud-note.h
@@ -53,7 +53,7 @@ GType biji_own_cloud_note_get_type (void);
BijiNoteObj *biji_own_cloud_note_new_from_info (BijiOwnCloudProvider *prov,
- BijiNoteBook *book,
+ BijiManager *manager,
BijiInfoSet *info);
G_END_DECLS
diff --git a/src/libbiji/provider/biji-own-cloud-provider.c b/src/libbiji/provider/biji-own-cloud-provider.c
index 7ecdbbb..6688642 100644
--- a/src/libbiji/provider/biji-own-cloud-provider.c
+++ b/src/libbiji/provider/biji-own-cloud-provider.c
@@ -160,14 +160,14 @@ create_note_from_item (BijiOCloudItem *item)
{
BijiNoteObj *note;
GdkRGBA color;
- BijiNoteBook *book;
+ BijiManager *manager;
- book = biji_provider_get_book (BIJI_PROVIDER (item->self));
+ manager = biji_provider_get_manager (BIJI_PROVIDER (item->self));
note = biji_own_cloud_note_new_from_info (item->self,
- book,
+ manager,
&item->set);
- biji_note_book_get_default_color (book, &color);
+ biji_manager_get_default_color (manager, &color);
biji_note_obj_set_rgba (note, &color);
g_hash_table_replace (item->self->priv->notes,
item->set.url,
@@ -222,7 +222,7 @@ on_content (GObject *source,
item->set.content = contents;
create_note_from_item (item);
biji_tracker_ensure_ressource_from_info (
- biji_provider_get_book (BIJI_PROVIDER (self)), &item->set);
+ biji_provider_get_manager (BIJI_PROVIDER (self)), &item->set);
// TODO --> ensure_ressource callback.... o_cloud_item_free (item);
}
@@ -281,7 +281,7 @@ static void
trash (gpointer urn_uuid, gpointer self)
{
biji_tracker_trash_ressource (
- biji_provider_get_book (BIJI_PROVIDER (self)), (gchar*) urn_uuid);
+ biji_provider_get_manager (BIJI_PROVIDER (self)), (gchar*) urn_uuid);
}
@@ -298,7 +298,7 @@ handle_next_item (BijiOwnCloudProvider *self)
{
g_hash_table_remove (self->priv->tracker, item->set.url);
- biji_tracker_check_for_info (biji_provider_get_book (BIJI_PROVIDER (self)),
+ biji_tracker_check_for_info (biji_provider_get_manager (BIJI_PROVIDER (self)),
item->set.url,
item->set.mtime,
check_info_maybe_read_file,
@@ -488,8 +488,8 @@ mine_notes (gboolean result, gpointer user_data)
info->datasource);
tracker_sparql_connection_query_async (
- biji_note_book_get_tracker_connection (
- biji_provider_get_book (provider)),
+ biji_manager_get_tracker_connection (
+ biji_provider_get_manager (provider)),
query,
NULL,
on_notes_mined,
@@ -522,7 +522,7 @@ handle_mount (BijiOwnCloudProvider *self)
g_object_unref (root);
biji_tracker_ensure_datasource (
- biji_provider_get_book (BIJI_PROVIDER (self)),
+ biji_provider_get_manager (BIJI_PROVIDER (self)),
self->priv->info.datasource,
MINER_ID,
mine_notes,
@@ -743,7 +743,7 @@ own_cloud_create_note (BijiProvider *provider,
return biji_own_cloud_note_new_from_info (
BIJI_OWN_CLOUD_PROVIDER (provider),
- biji_provider_get_book (provider),
+ biji_provider_get_manager (provider),
&info);
}
@@ -762,18 +762,18 @@ own_cloud_create_full (BijiProvider *provider,
BijiOwnCloudProvider *self;
BijiNoteObj *retval;
GdkRGBA override_color;
- BijiNoteBook *book;
+ BijiManager *manager;
self = BIJI_OWN_CLOUD_PROVIDER (provider);
- book = biji_provider_get_book (provider);
+ manager = biji_provider_get_manager (provider);
- retval = biji_own_cloud_note_new_from_info (self, book, info);
+ retval = biji_own_cloud_note_new_from_info (self, manager, info);
biji_note_obj_set_html (retval, html);
/* We do not use suggested color.
* Rather use ook default */
- biji_note_book_get_default_color (book, &override_color);
+ biji_manager_get_default_color (manager, &override_color);
biji_note_obj_set_rgba (retval, &override_color);
return retval;
@@ -821,11 +821,11 @@ biji_own_cloud_provider_class_init (BijiOwnCloudProviderClass *klass)
BijiProvider *
-biji_own_cloud_provider_new (BijiNoteBook *book,
+biji_own_cloud_provider_new (BijiManager *manager,
GoaObject *object)
{
return g_object_new (BIJI_TYPE_OWN_CLOUD_PROVIDER,
- "book", book,
+ "manager", manager,
"goa", object,
NULL);
}
diff --git a/src/libbiji/provider/biji-own-cloud-provider.h b/src/libbiji/provider/biji-own-cloud-provider.h
index 5a1d7f6..2915e13 100644
--- a/src/libbiji/provider/biji-own-cloud-provider.h
+++ b/src/libbiji/provider/biji-own-cloud-provider.h
@@ -52,7 +52,7 @@ GType biji_own_cloud_provider_get_type (void);
-BijiProvider *biji_own_cloud_provider_new (BijiNoteBook *book,
+BijiProvider *biji_own_cloud_provider_new (BijiManager *manager,
GoaObject *object);
diff --git a/src/libbiji/provider/biji-provider.c b/src/libbiji/provider/biji-provider.c
index d100a46..1967c22 100644
--- a/src/libbiji/provider/biji-provider.c
+++ b/src/libbiji/provider/biji-provider.c
@@ -20,7 +20,7 @@
* TODO: the generic provider should at least
* be the one emiting the signals
*
- * So 1. for each provider, the book connects to the same
+ * So 1. for each provider, the manager connects to the same
* & provider does not reinvent anything
* 2. it might be a right place for running the approriate
* threads - or even processes.
@@ -51,16 +51,16 @@ static GParamSpec *properties[PROVIDER_PROP] = { NULL, };
struct BijiProviderPrivate_
{
- BijiNoteBook *book;
+ BijiManager *manager;
};
G_DEFINE_TYPE (BijiProvider, biji_provider, G_TYPE_OBJECT)
-BijiNoteBook *
-biji_provider_get_book (BijiProvider *provider)
+BijiManager *
+biji_provider_get_manager (BijiProvider *provider)
{
- return provider->priv->book;
+ return provider->priv->manager;
}
@@ -88,7 +88,7 @@ static void
biji_provider_init (BijiProvider *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, BIJI_TYPE_PROVIDER, BijiProviderPrivate);
- self->priv->book = NULL;
+ self->priv->manager = NULL;
}
@@ -115,7 +115,7 @@ biji_provider_set_property (GObject *object,
switch (property_id)
{
case PROP_BOOK:
- self->priv->book = g_value_dup_object (value);
+ self->priv->manager = g_value_dup_object (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -134,7 +134,7 @@ biji_provider_get_property (GObject *object,
switch (property_id)
{
case PROP_BOOK:
- g_value_set_object (value, self->priv->book);
+ g_value_set_object (value, self->priv->manager);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -169,10 +169,10 @@ biji_provider_class_init (BijiProviderClass *klass)
properties[PROP_BOOK] =
- g_param_spec_object("book",
+ g_param_spec_object("manager",
"Note Book",
"The Note Book",
- BIJI_TYPE_NOTE_BOOK,
+ BIJI_TYPE_MANAGER,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
diff --git a/src/libbiji/provider/biji-provider.h b/src/libbiji/provider/biji-provider.h
index f6ee7be..df51cca 100644
--- a/src/libbiji/provider/biji-provider.h
+++ b/src/libbiji/provider/biji-provider.h
@@ -22,7 +22,7 @@
#include <glib/gi18n.h> // translate providers type
#include "../biji-info-set.h"
-#include "../biji-note-book.h"
+#include "../biji-manager.h"
G_BEGIN_DECLS
@@ -73,7 +73,7 @@ struct BijiProviderClass_
const BijiProviderInfo* (*get_info) (BijiProvider *provider);
- /* When a provider is loaded, notify the book to transmit the items */
+ /* When a provider is loaded, notify the manager to transmit the items */
void (*notify_loaded) (BijiProvider *provider,
GList *loaded_items);
@@ -122,7 +122,7 @@ struct BijiProviderClass_
GType biji_provider_get_type (void);
-BijiNoteBook *biji_provider_get_book (BijiProvider *provider);
+BijiManager *biji_provider_get_manager (BijiProvider *provider);
const BijiProviderInfo *biji_provider_get_info (BijiProvider *provider);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
