|
 |
ab22845 |
From d869f7da0eec48df1f52771fed8ed12b12fbab61 Mon Sep 17 00:00:00 2001
|
|
|
ab22845 |
From: =?UTF-8?q?Toms=20Bau=C4=A3is?= <toms.baugis@gmail.com>
|
|
|
ab22845 |
Date: Sat, 3 Oct 2015 14:48:57 +0100
|
|
|
ab22845 |
Subject: [PATCH] temp remove WATCH_HARD_LINKS flag from file monitor as it
|
|
|
ab22845 |
causes segfaults on gnome 3.18. closes #254
|
|
|
ab22845 |
|
|
|
ab22845 |
---
|
|
|
ab22845 |
src/hamster-service | 3 +--
|
|
|
ab22845 |
src/hamster/storage/db.py | 3 +--
|
|
|
ab22845 |
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
ab22845 |
|
|
|
ab22845 |
diff --git a/src/hamster-service b/src/hamster-service
|
|
|
ab22845 |
index 681fe76..d3e260e 100755
|
|
|
ab22845 |
--- a/src/hamster-service
|
|
|
ab22845 |
+++ b/src/hamster-service
|
|
|
ab22845 |
@@ -54,8 +54,7 @@ class Storage(db.Storage, dbus.service.Object):
|
|
|
ab22845 |
|
|
|
ab22845 |
self.__file = gio.File.new_for_path(__file__)
|
|
|
ab22845 |
self.__monitor = self.__file.monitor_file(gio.FileMonitorFlags.WATCH_MOUNTS | \
|
|
|
ab22845 |
- gio.FileMonitorFlags.SEND_MOVED | \
|
|
|
ab22845 |
- gio.FileMonitorFlags.WATCH_HARD_LINKS,
|
|
|
ab22845 |
+ gio.FileMonitorFlags.SEND_MOVED,
|
|
|
ab22845 |
None)
|
|
|
ab22845 |
self.__monitor.connect("changed", self._on_us_change)
|
|
|
ab22845 |
|
|
|
ab22845 |
diff --git a/src/hamster/storage/db.py b/src/hamster/storage/db.py
|
|
|
ab22845 |
index 1c598e3..505d341 100644
|
|
|
ab22845 |
--- a/src/hamster/storage/db.py
|
|
|
ab22845 |
+++ b/src/hamster/storage/db.py
|
|
|
ab22845 |
@@ -90,8 +90,7 @@ def on_db_file_change(monitor, gio_file, event_uri, event):
|
|
|
ab22845 |
|
|
|
ab22845 |
self.__database_file = gio.File.new_for_path(self.db_path)
|
|
|
ab22845 |
self.__db_monitor = self.__database_file.monitor_file(gio.FileMonitorFlags.WATCH_MOUNTS | \
|
|
|
ab22845 |
- gio.FileMonitorFlags.SEND_MOVED | \
|
|
|
ab22845 |
- gio.FileMonitorFlags.WATCH_HARD_LINKS,
|
|
|
ab22845 |
+ gio.FileMonitorFlags.SEND_MOVED,
|
|
|
ab22845 |
None)
|
|
|
ab22845 |
self.__db_monitor.connect("changed", on_db_file_change)
|
|
|
ab22845 |
|