Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix watching clipboard change when the file initially doesn't exists (#749)

Browse Source 
When the file doesn't exists, adding a watch fails. So monitor directory
for IN_CREATE event and when file is created - add the modify watch.
This watch will miss the first update (rather: create), so fire it
in IN_CREATE handler.
This commit is contained in:
Marek Marczykowski-Górecki 2013-10-18 03:33:56 +02:00
parent 78d615e375
commit fa61fceddd
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qubesmanager/main.py
View File

@ -22,6 +22,7 @@
import sys import sys
import os import os
import os.path
import signal import signal
import fcntl import fcntl
import errno import errno
@ -98,6 +99,11 @@ class QubesManagerFileWatcher(ProcessEvent):
"<small>Press Ctrl-Shift-v to copy this clipboard onto dest VM's clipboard.</small>".format(src_vmname), "<small>Press Ctrl-Shift-v to copy this clipboard onto dest VM's clipboard.</small>".format(src_vmname),
msecs=3000) msecs=3000)
src_info_file.close() src_info_file.close()
def process_IN_CREATE(self, event):
if event.name == os.path.basename(qubes_clipboard_info_file):
event.path = qubes_clipboard_info_file
self.process_IN_CLOSE_WRITE(event)
wm.add_watch(qubes_clipboard_info_file, EventsCodes.OP_FLAGS.get('IN_CLOSE_WRITE'))
class VmIconWidget (QWidget): class VmIconWidget (QWidget):
@ -2210,13 +2216,15 @@ def main():
global manager_window global manager_window
manager_window = VmManagerWindow() manager_window = VmManagerWindow()
wm = WatchManager()
global wm
wm = WatchManager()
global notifier global notifier
notifier = ThreadedNotifier(wm, QubesManagerFileWatcher(manager_window.mark_table_for_update)) notifier = ThreadedNotifier(wm, QubesManagerFileWatcher(manager_window.mark_table_for_update))
notifier.start() notifier.start()
wm.add_watch(system_path["qubes_store_filename"], EventsCodes.OP_FLAGS.get('IN_MODIFY')) wm.add_watch(system_path["qubes_store_filename"], EventsCodes.OP_FLAGS.get('IN_MODIFY'))
wm.add_watch(qubes_clipboard_info_file, EventsCodes.OP_FLAGS.get('IN_CLOSE_WRITE')) wm.add_watch(qubes_clipboard_info_file, EventsCodes.OP_FLAGS.get('IN_CLOSE_WRITE'))
wm.add_watch(os.path.dirname(qubes_clipboard_info_file), EventsCodes.OP_FLAGS.get('IN_CREATE'))
global system_bus global system_bus
system_bus = QDBusConnection.systemBus() system_bus = QDBusConnection.systemBus()