[bijiben] Tracker: remove get_all_tracker_tags
- From: Pierre-Yves Luyten <pyluyten src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [bijiben] Tracker: remove get_all_tracker_tags
- Date: Sat, 17 Nov 2012 23:09:30 +0000 (UTC)
commit e5bc302087ab6827ec4531081623437de430406f
Author: Pierre-Yves Luyten <py luyten fr>
Date: Sun Nov 18 00:05:08 2012 +0100
Tracker: remove get_all_tracker_tags
Also remove tags member from Window structure, this has no sense
Now all tags retrieval should go throught the async func which might be gradually improved
src/bjb-note-tag-dialog.c | 4 ----
src/bjb-window-base.c | 28 ++--------------------------
src/bjb-window-base.h | 4 ----
src/libbiji/biji-tracker.c | 37 -------------------------------------
src/libbiji/biji-tracker.h | 3 ---
5 files changed, 2 insertions(+), 74 deletions(-)
---
diff --git a/src/bjb-note-tag-dialog.c b/src/bjb-note-tag-dialog.c
index 1ed6d9b..3b63654 100644
--- a/src/bjb-note-tag-dialog.c
+++ b/src/bjb-note-tag-dialog.c
@@ -179,11 +179,7 @@ on_tag_toggled (GtkCellRendererToggle *cell,
static void
add_new_tag (BjbNoteTagDialog *self)
{
- /* Push the tag to tracker */
push_tag_to_tracker ((gchar*) gtk_entry_get_text(GTK_ENTRY(self->priv->entry)));
- bjb_window_base_set_tags (GTK_WIDGET (self->priv->window), get_all_tracker_tags());
-
- /* Update the view */
update_tags_model (self);
}
diff --git a/src/bjb-window-base.c b/src/bjb-window-base.c
index b8143de..c2034fe 100644
--- a/src/bjb-window-base.c
+++ b/src/bjb-window-base.c
@@ -32,7 +32,7 @@ struct _BjbWindowBasePriv
BjbController *controller;
/* The real data */
- GList *tags ;
+ //GList *tags ;
/* UI */
ClutterActor *stage, *frame ;
@@ -138,7 +138,7 @@ bjb_window_base_init (BjbWindowBase *self)
/* We probably want to offer a no entry window at first (startup) */
priv->entry = NULL ;
- priv->tags = get_all_tracker_tags();
+ //priv->tags = get_all_tracker_tags();
priv->font = pango_font_description_from_string (BJB_DEFAULT_FONT);
/* UI */
@@ -237,30 +237,6 @@ bjb_window_base_get_book(GtkWidget * win)
}
}
-GList *
-bjb_window_base_get_tags(GtkWidget * win)
-{
- BjbWindowBase *b = BJB_WINDOW_BASE(win);
-
- if ( b->priv )
- return b->priv->tags ;
-
- else
- return NULL ;
-}
-
-void
-bjb_window_base_set_tags(GtkWidget * win, GList * tags)
-{
- BjbWindowBase *b = BJB_WINDOW_BASE(win);
-
- if ( b->priv->tags != NULL )
- g_list_free_full (b->priv->tags,(GDestroyNotify) g_free);
-
- b->priv->tags = tags ;
-}
-
-
void
bjb_window_base_set_entry(GtkWidget *win, gchar *search_entry)
{
diff --git a/src/bjb-window-base.h b/src/bjb-window-base.h
index 5d1af2f..586463b 100644
--- a/src/bjb-window-base.h
+++ b/src/bjb-window-base.h
@@ -60,10 +60,6 @@ ClutterActor * bjb_window_base_get_stage(BjbWindowBase *bwb);
BijiNoteBook * bjb_window_base_get_book(GtkWidget * win);
-GList * bjb_window_base_get_tags(GtkWidget * win);
-
-void bjb_window_base_set_tags(GtkWidget * win, GList * tags);
-
void bjb_window_base_set_entry(GtkWidget *win, gchar *search_entry) ;
void bjb_window_base_delete_entry(GtkWidget *win);
diff --git a/src/libbiji/biji-tracker.c b/src/libbiji/biji-tracker.c
index 49551a7..23b1143 100644
--- a/src/libbiji/biji-tracker.c
+++ b/src/libbiji/biji-tracker.c
@@ -210,43 +210,6 @@ biji_get_all_tracker_tags_async (GAsyncReadyCallback f,
bjb_perform_query_async (query, f, user_data);
}
-/* TODO : delete this one */
-GList *
-get_all_tracker_tags()
-{
- GList *ret = NULL ;
-
- // Get all available tags
- gchar *query = "SELECT DISTINCT ?labels WHERE \
- { ?tags a nao:Tag ; nao:prefLabel ?labels. }";
-
- /* This old version only gets tags which are assigned
- "SELECT DISTINCT ?labels WHERE {?f nie:isStoredAs ?as ; nao:hasTag ?tags. \
- ?u a nfo:FileDataObject . ?tags a nao:Tag ; nao:prefLabel ?labels. }"; */
-
- TrackerSparqlCursor *cursor = bjb_perform_query( query) ;
-
- if (!cursor)
- {
- g_message ("no result..");
- return NULL ;
- }
-
- else
- {
- GString * tag ;
- while (tracker_sparql_cursor_next (cursor, NULL, NULL))
- {
- tag = g_string_new(tracker_sparql_cursor_get_string(cursor,0,NULL));
- ret = g_list_append(ret,(gpointer)g_string_free(tag,FALSE));
- }
-
- g_object_unref (cursor);
- }
-
- return ret;
-}
-
void
push_tag_to_tracker(gchar *tag)
{
diff --git a/src/libbiji/biji-tracker.h b/src/libbiji/biji-tracker.h
index c20b3b3..e5c480e 100644
--- a/src/libbiji/biji-tracker.h
+++ b/src/libbiji/biji-tracker.h
@@ -33,9 +33,6 @@ gint tracker_tag_get_number_of_files(gchar *tag);
GList * biji_get_all_tags_finish (GObject *source_object, GAsyncResult *res);
void biji_get_all_tracker_tags_async (GAsyncReadyCallback f, gpointer user_data);
-/* don't use this , might block */
-GList *get_all_tracker_tags (void);
-
void push_tag_to_tracker(gchar *tag);
void remove_tag_from_tracker(gchar *tag);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]