r25705 - in /desktop/unstable/hamster-applet/debian: changelog patches/11_monitor.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Nov 29 08:16:49 2010
New Revision: 25705

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25705
Log:
11_monitor.patch: patch from Scott Barker, backported from 2.32. Fix 
file monitoring. Closes: #605036.

Added:
    desktop/unstable/hamster-applet/debian/patches/11_monitor.patch
Modified:
    desktop/unstable/hamster-applet/debian/changelog
    desktop/unstable/hamster-applet/debian/patches/series

Modified: desktop/unstable/hamster-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/changelog?rev=25705&op=diff
==============================================================================
--- desktop/unstable/hamster-applet/debian/changelog [utf-8] (original)
+++ desktop/unstable/hamster-applet/debian/changelog [utf-8] Mon Nov 29 08:16:49 2010
@@ -1,6 +1,8 @@
 hamster-applet (2.30.2-3) UNRELEASED; urgency=low
 
   * Recommend gnome-icon-theme. Closes: #604896.
+  * 11_monitor.patch: patch from Scott Barker, backported from 2.32. Fix 
+    file monitoring. Closes: #605036.
 
  -- Josselin Mouette <joss at debian.org>  Thu, 25 Nov 2010 09:57:10 +0100
 

Added: desktop/unstable/hamster-applet/debian/patches/11_monitor.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/patches/11_monitor.patch?rev=25705&op=file
==============================================================================
--- desktop/unstable/hamster-applet/debian/patches/11_monitor.patch (added)
+++ desktop/unstable/hamster-applet/debian/patches/11_monitor.patch [utf-8] Mon Nov 29 08:16:49 2010
@@ -1,0 +1,15 @@
+diff -urbBw hamster-applet-2.30.2/src/hamster/configuration.py hamster-applet-2.30.2.local1/src/hamster/configuration.py
+--- hamster-applet-2.30.2/src/hamster/configuration.py	2010-11-26 09:39:22.000000000 -0700
++++ hamster-applet-2.30.2.local1/src/hamster/configuration.py	2010-11-26 09:35:39.000000000 -0700
+@@ -91,7 +91,11 @@
+                 if gio_file.query_info(gio.FILE_ATTRIBUTE_ETAG_VALUE).get_etag() == self.last_etag:
+                     # ours
+                     return
++            elif event == gio.FILE_MONITOR_EVENT_CREATED:
++                # treat case when instead of a move, a remove and create has been performed
++                self.storage.con = None
+ 
++            if event in (gio.FILE_MONITOR_EVENT_CHANGES_DONE_HINT, gio.FILE_MONITOR_EVENT_CREATED):
+                 logging.info("DB file has been modified externally. Calling all stations")
+                 self.storage.dispatch_overwrite()
+ 

Modified: desktop/unstable/hamster-applet/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/patches/series?rev=25705&op=diff
==============================================================================
--- desktop/unstable/hamster-applet/debian/patches/series [utf-8] (original)
+++ desktop/unstable/hamster-applet/debian/patches/series [utf-8] Mon Nov 29 08:16:49 2010
@@ -1,3 +1,4 @@
 01_startup-fix.patch
 02_absolute-imports.patch
 10_colordepth.patch
+11_monitor.patch