[gnome-notes] Remove zeitgeist support
- From: Isaque Galdino de Araujo <igaldino src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-notes] Remove zeitgeist support
- Date: Mon, 1 Feb 2021 00:45:16 +0000 (UTC)
commit bcfbd9a4113bac51ccb81477ac742213287dcc21
Author: Mohammed Sadiq <sadiq sadiqpk org>
Date: Wed Jan 27 12:30:26 2021 +0530
Remove zeitgeist support
zeitgeist support is disabled by default. This is not enabled
in Debian/Fedora/Ubuntu. Also zeitgeist is not used
in any of the GNOME projects. So Let's avoid it, so
that we have less code to maintain
meson.build | 1 -
meson_options.txt | 1 -
src/libbiji/biji-manager.c | 19 -----
src/libbiji/biji-manager.h | 10 ---
src/libbiji/biji-note-obj.c | 21 -----
src/libbiji/biji-zeitgeist.c | 181 -------------------------------------------
src/libbiji/biji-zeitgeist.h | 32 --------
src/libbiji/libbiji.h | 4 -
src/libbiji/meson.build | 8 --
9 files changed, 277 deletions(-)
---
diff --git a/meson.build b/meson.build
index 3b1b1ba..3286b64 100644
--- a/meson.build
+++ b/meson.build
@@ -152,6 +152,5 @@ meson.add_install_script(
)
output = ' Version: ' + bijiben_version + '\n'
-output += ' Enable Zeitgeist ' + enable_zeitgeist.to_string() + '\n'
output += ' Use Private Store ' + private_store.to_string() + ' (Tracker3: ' + has_tracker3.to_string() +
')\n'
message(output)
diff --git a/meson_options.txt b/meson_options.txt
index 1e9a06a..2d3e69f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,3 @@
-option('zeitgeist', type: 'boolean', value: false, description: 'Enable Zeitgeist')
option('update_mimedb', type: 'boolean', value: true, description: 'update-mime-database after install')
option('private_store', type: 'boolean', value: false, description: 'Use Tracker private store instead of
Tracker service')
option('profile', type: 'combo', choices: [ 'default', 'development'], value: 'default')
diff --git a/src/libbiji/biji-manager.c b/src/libbiji/biji-manager.c
index 25ebd14..4e2034d 100644
--- a/src/libbiji/biji-manager.c
+++ b/src/libbiji/biji-manager.c
@@ -49,11 +49,6 @@ struct _BijiManager
GFile *location;
TrackerSparqlConnection *connection;
-
-#ifdef BUILD_ZEITGEIST
- ZeitgeistLog *log;
-#endif /* BUILD_ZEITGEIST */
-
GdkRGBA color;
};
@@ -322,16 +317,6 @@ biji_manager_init (BijiManager *self)
g_free, g_object_unref);
}
-
-#ifdef BUILD_ZEITGEIST
-ZeitgeistLog *
-biji_manager_get_zg_log (BijiManager *self)
-{
- return self->log;
-}
-#endif /* BUILD_ZEITGEIST */
-
-
TrackerSparqlConnection *
biji_manager_get_tracker_connection (BijiManager *self)
{
@@ -674,10 +659,6 @@ biji_manager_constructed (GObject *object)
G_OBJECT_CLASS (biji_manager_parent_class)->constructed (object);
-#ifdef BUILD_ZEITGEIST
- BIJI_MANAGER (object)->log = biji_zeitgeist_init ();
-#endif /* BUILD_ZEITGEIST */
-
/* Ensure cache directory for icons */
filename = g_build_filename (g_get_user_cache_dir (),
g_get_application_name (),
diff --git a/src/libbiji/biji-manager.h b/src/libbiji/biji-manager.h
index 8dd8f3f..d1066b7 100644
--- a/src/libbiji/biji-manager.h
+++ b/src/libbiji/biji-manager.h
@@ -3,10 +3,6 @@
#include <glib-object.h>
#include <tracker-sparql.h>
-#ifdef BUILD_ZEITGEIST
-#include <zeitgeist.h>
-#endif /* BUILD_ZEIGEIST */
-
#include "biji-info-set.h"
#include "biji-note-obj.h"
@@ -62,12 +58,6 @@ void biji_manager_import_uri (BijiManager *manager,
const gchar *uri);
GList *biji_manager_get_providers (BijiManager *manager); /* <ProviderInfo*> */
-
-
-#ifdef BUILD_ZEITGEIST
-ZeitgeistLog *biji_manager_get_zg_log (BijiManager *manager);
-#endif /* BUILD_ZEITGEIST */
-
TrackerSparqlConnection
*biji_manager_get_tracker_connection (BijiManager *manager);
diff --git a/src/libbiji/biji-note-obj.c b/src/libbiji/biji-note-obj.c
index 5c4cd23..898b3f9 100644
--- a/src/libbiji/biji-note-obj.c
+++ b/src/libbiji/biji-note-obj.c
@@ -22,10 +22,6 @@
#include "biji-timeout.h"
#include "biji-tracker.h"
-#ifdef BUILD_ZEITGEIST
-#include "biji-zeitgeist.h"
-#endif /* BUILD_ZEITGEIST */
-
#include "editor/biji-webkit-editor.h"
typedef struct
@@ -104,10 +100,6 @@ on_save_timeout (BijiNoteObj *self)
BIJI_NOTE_OBJ_GET_CLASS (self)->save_note (self);
-#ifdef BUILD_ZEITGEIST
- insert_zeitgeist (self, ZEITGEIST_ZG_MODIFY_EVENT);
-#endif /* BUILD_ZEITGEIST */
-
priv->needs_save = FALSE;
g_object_unref (self);
}
@@ -247,11 +239,6 @@ trash (BijiItem *item)
char *icon_path = NULL;
gboolean result = FALSE;
- /* The event has to be logged before the note is actually deleted */
-#ifdef BUILD_ZEITGEIST
- insert_zeitgeist (note_to_kill, ZEITGEIST_ZG_DELETE_EVENT);
-#endif /* BUILD_ZEITGEIST */
-
priv->needs_save = FALSE;
biji_timeout_cancel (priv->timeout);
result = BIJI_NOTE_OBJ_GET_CLASS (self)->archive (self);
@@ -895,10 +882,6 @@ on_biji_note_obj_closed_cb (BijiNoteObj *self)
priv->editor = NULL;
title = biji_item_get_title (item);
-#ifdef BUILD_ZEITGEIST
- insert_zeitgeist (note, ZEITGEIST_ZG_LEAVE_EVENT);
-#endif /* BUILD_ZEITGEIST */
-
/*
* Delete (not _trash_ if note is totaly blank
* A Cancellable would be better than needs->save
@@ -927,10 +910,6 @@ biji_note_obj_open (BijiNoteObj *self)
g_signal_connect_swapped (priv->editor, "destroy",
G_CALLBACK (on_biji_note_obj_closed_cb), self);
-#ifdef BUILD_ZEITGEIST
- insert_zeitgeist (note, ZEITGEIST_ZG_ACCESS_EVENT);
-#endif /* BUILD_ZEITGEIST */
-
return GTK_WIDGET (priv->editor);
}
diff --git a/src/libbiji/libbiji.h b/src/libbiji/libbiji.h
index 5855190..5f3fa28 100644
--- a/src/libbiji/libbiji.h
+++ b/src/libbiji/libbiji.h
@@ -29,10 +29,6 @@
#include "biji-string.h"
#include "biji-tracker.h"
-#ifdef BUILD_ZEITGEIST
-#include "biji-zeitgeist.h"
-#endif /* BUILD_ZEITGEIST */
-
#include "deserializer/biji-lazy-deserializer.h"
#include "editor/biji-webkit-editor.h"
#include "provider/biji-provider.h"
diff --git a/src/libbiji/meson.build b/src/libbiji/meson.build
index f7ec0f2..f6e2d24 100644
--- a/src/libbiji/meson.build
+++ b/src/libbiji/meson.build
@@ -21,7 +21,6 @@ sources = files(
'biji-string.c',
'biji-timeout.c',
'biji-tracker.c',
- 'biji-zeitgeist.c',
'../bjb-utils.c',
)
@@ -37,13 +36,6 @@ deps = bijiben_deps
cflags = []
-enable_zeitgeist = get_option('zeitgeist')
-if enable_zeitgeist
- deps += [dependency('zeitgeist-2.0')]
-
- cflags += '-DBUILD_ZEITGEIST'
-endif
-
libbiji = static_library(
'biji',
sources: sources,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]