Tag for commit da2b0cde16

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJU8N9vAAoJEBu5sftaTG2twC4P/A+AhTkx6VL7GtzuPKTlGSrL
 nwdDgazTKm7ZuZrRdr5H5vuSH9FQhcjcEg3yC3DR4AMebd4KHVggL15CpUwp/LpI
 BuVIIi5Apn0e3QkXU2VpU+EzlY0fcIxVUqhskfTGzgnq9qd+uKOM5O2i9Z/263Ld
 UV4RGaWXt9hKIO4AbGafRuadQYJVC5/DdTKKA/H61vng6EiXwi3jMlZJyS5Lfgdr
 NWedy9l5scUBElzKyplz/htPmghi3LQx7uJSEvHJYgGCrbksRDRD73TUmG6OV6mB
 CT8ApZ3rOiekhuYdT7d0E8MOdID/LBCipabLpXEHfmtwYTtM3YZzxrnBXM7CcS0s
 j7OKQyMeWMHvmEVvZzBpFuq/bjxL6ltBPoJ0uYTjIaK2RkiJajEUqjtt9d0mBMDq
 qN2wPvDqpWCfDps10Iu/zLIBejo71bTTve9M9G0Z13M8g/6MjUDmSESar0tEhnEG
 zlEwwTCk4Tqu2zdGpJSpKjAY7rmsI4IpdREvXbuXXwvMKlVIG6eR91muyz4gAxx3
 KsPKPQKKGDNO9ZuJAqYt6+Ec2xp+BhlnhN0vvgciPvpK48YRkyFUaRM52Q0hVaUA
 kZPc9JjPbyDX44S9EA+HBNzMKSaPSqyPDv8cH0ws83MoOLdi+xItK4e5rLyKQVd+
 Kw502V+yos6e/72lhAnm
 =f3yD
 -----END PGP SIGNATURE-----

Merge tag 'jm_da2b0cde'

Tag for commit da2b0cde16

# gpg: Signature made Fri Feb 27 22:19:43 2015 CET using RSA key ID 5A4C6DAD
# gpg: Good signature from "Jason Mehring (Qubes OS Signing Key) <nrgaway@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: E0E3 2283 FDCA C1A5 1007  8F27 1BB9 B1FB 5A4C 6DAD

Makefile

@@ -175,11 +175,10 @@ install-common:
 	install -m 0644 qubes-rpc/qubes.GetImageRGBA $(DESTDIR)/etc/qubes-rpc
 	install -m 0644 qubes-rpc/qubes.SetDateTime $(DESTDIR)/etc/qubes-rpc
 
-	install -d $(DESTDIR)/usr/share/file-manager/actions
+	install -d $(DESTDIR)/usr/share/nautilus-python/extensions
-	install -m 0644 qubes-rpc/*-gnome.desktop $(DESTDIR)/usr/share/file-manager/actions
+	install -m 0644 qubes-rpc/*_nautilus.py $(DESTDIR)/usr/share/nautilus-python/extensions
 
 	install -D -m 0755 misc/qubes-desktop-run $(DESTDIR)/usr/bin/qubes-desktop-run
-	install -D misc/nautilus-actions.conf $(DESTDIR)/etc/xdg/nautilus-actions/nautilus-actions.conf
 
 	install -d $(DESTDIR)/mnt/removable
 

debian/control

@@ -10,7 +10,7 @@ Vcs-Git: git://git.qubes-os.org/marmarek/core-agent-linux.git
 Package: qubes-core-agent
 Architecture: any
 Depends: qubes-utils (>= 3.0.1), libvchan-xen, xenstore-utils, iptables-persistent, xserver-xorg-video-dummy, xen-utils-common, ethtool, python2.7, python-gi, init-system-helpers, xdg-user-dirs, iptables, net-tools, initscripts, imagemagick, fakeroot, systemd, locales, sudo, dmsetup, psmisc, ncurses-term, xserver-xorg-core, x11-xserver-utils, xinit, ${shlibs:Depends}, ${misc:Depends}
-Recommends: tinyproxy, gnome-themes-standard, xsettingsd, gnome-packagekit, chrony, ntpdate, network-manager (>= 0.8.1-1), network-manager-gnome, haveged, nautilus-actions, libnotify-bin, notify-osd, gnome-terminal
+Recommends: tinyproxy, gnome-themes-standard, xsettingsd, gnome-packagekit, chrony, ntpdate, network-manager (>= 0.8.1-1), network-manager-gnome, haveged, libnotify-bin, notify-osd, gnome-terminal, python-nautilus
 Conflicts: qubes-core-agent-linux, firewalld, qubes-core-vm-sysvinit
 Description: Qubes core agent
  This package includes various daemons necessary for qubes domU support,

misc/nautilus-actions.conf

@@ -1,7 +0,0 @@
-[runtime]
-items-create-root-menu=false
-items-add-about-item=false
-
-[io-provider na-desktop]
-readable=true
-writable=true

qubes-rpc/qvm-copy-gnome.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Action
-ToolbarLabel[C]=Copy to other AppVM
-Name[C]=Copy to other AppVM
-Profiles=profile-zero;
-
-[X-Action-Profile profile-zero]
-Exec=/usr/lib/qubes/qvm-copy-to-vm.gnome %F
-Name[C]=Default profile

qubes-rpc/qvm-dvm-gnome.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Action
-ToolbarLabel[C]=Open in DisposableVM
-Name[C]=Open in DisposableVM
-Profiles=profile-zero;
-
-[X-Action-Profile profile-zero]
-Exec=/usr/bin/qvm-open-in-dvm %f
-Name[C]=Default profile

qubes-rpc/qvm-move-gnome.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Action
-ToolbarLabel[C]=Move to other AppVM
-Name[C]=Move to other AppVM
-Profiles=profile-zero;
-
-[X-Action-Profile profile-zero]
-Exec=/usr/lib/qubes/qvm-move-to-vm.gnome %F
-Name[C]=Default profile

qubes-rpc/qvm-move-to-vm.gnome

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # The Qubes OS Project, http://www.qubes-os.org
 #

qubes-rpc/qvm-move-to-vm.kde

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # The Qubes OS Project, http://www.qubes-os.org
 #

qubes-rpc/qvm_copy_nautilus.py

@@ -0,0 +1,36 @@
+import subprocess
+
+from gi.repository import Nautilus, GObject
+
+
+class CopyToAppvmItemExtension(GObject.GObject, Nautilus.MenuProvider):
+    '''Copy file(s) to AppVM.
+
+    Uses the nautilus-python api to previce a context menu with Nautilus which
+    will enable the user to select file(s) to to copy to another AppVM
+    '''
+    def get_file_items(self, window, files):
+        '''Attaches context menu in Nautilus
+        '''
+        if not files:
+            return
+
+        menu_item = Nautilus.MenuItem(name='QubesMenuProvider::CopyToAppvm',
+                                      label='Copy To Other AppVM...',
+                                      tip='',
+                                      icon='')
+
+        menu_item.connect('activate', self.on_menu_item_clicked, files)
+        return menu_item,
+
+    def on_menu_item_clicked(self, menu, files):
+        '''Called when user chooses files though Nautilus context menu.
+        '''
+        for file_obj in files:
+
+            # Check if file still exists
+            if file_obj.is_gone():
+                return
+
+            gio_file = file_obj.get_location()
+            subprocess.call(['/usr/lib/qubes/qvm-copy-to-vm.gnome', gio_file.get_path()])

qubes-rpc/qvm_dvm_nautilus.py

@@ -0,0 +1,43 @@
+import os
+from subprocess import Popen
+
+from gi.repository import Nautilus, GObject
+
+
+class OpenInDvmItemExtension(GObject.GObject, Nautilus.MenuProvider):
+    '''Open File(s) in DisposableVM.
+
+    Uses the nautilus-python api to provide a context menu within Nautilus which
+    will enable the user to select file(s) to to open in a disposableVM
+    '''
+
+    def get_file_items(self, window, files):
+        '''Attaches context menu in Nautilus
+        '''
+        if not files:
+            return
+
+        menu_item = Nautilus.MenuItem(name='QubesMenuProvider::OpenInDvm',
+                                      label='Open In DisposableVM',
+                                      tip='',
+                                      icon='')
+
+        menu_item.connect('activate', self.on_menu_item_clicked, files)
+        return menu_item,
+
+    def on_menu_item_clicked(self, menu, files):
+        '''Called when user chooses files though Nautilus context menu.
+        '''
+        for file_obj in files:
+
+            # Check if file still exists
+            if file_obj.is_gone():
+                return
+
+            gio_file = file_obj.get_location()
+
+            # Use subprocess.DEVNULL in python >= 3.3
+            devnull = open(os.devnull, 'wb')
+
+            # Use Popen instead of subprocess.call to spawn the process
+            Popen(['nohup', '/usr/bin/qvm-open-in-dvm', gio_file.get_path()], stdout=devnull, stderr=devnull)

qubes-rpc/qvm_move_nautilus.py

@@ -0,0 +1,36 @@
+import subprocess
+
+from gi.repository import Nautilus, GObject
+
+
+class MoveToAppvmItemExtension(GObject.GObject, Nautilus.MenuProvider):
+    '''Move file(s) to AppVM.
+
+    Uses the nautilus-python api to provide a context menu within Nautilus which
+    will enable the user to select file(s) to to move to another AppVM
+    '''
+    def get_file_items(self, window, files):
+        '''Attaches context menu in Nautilus
+        '''
+        if not files:
+            return
+
+        menu_item = Nautilus.MenuItem(name='QubesMenuProvider::MoveToAppvm',
+                                      label='Move To Other AppVM...',
+                                      tip='',
+                                      icon='')
+
+        menu_item.connect('activate', self.on_menu_item_clicked, files)
+        return menu_item,
+
+    def on_menu_item_clicked(self, menu, files):
+        '''Called when user chooses files though Nautilus context menu.
+        '''
+        for file_obj in files:
+
+            # Check if file still exists
+            if file_obj.is_gone():
+                return
+
+            gio_file = file_obj.get_location()
+            subprocess.call(['/usr/lib/qubes/qvm-move-to-vm.gnome', gio_file.get_path()])

rpm_spec/core-vm.spec

@@ -45,7 +45,7 @@ Requires:   ethtool
 Requires:   tinyproxy
 Requires:   ntpdate
 Requires:   net-tools
-Requires:   nautilus-actions
+Requires:   nautilus-python
 Requires:   qubes-core-vm-kernel-placeholder
 Requires:   qubes-utils
 Requires:   initscripts
@@ -389,7 +389,6 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/udev/rules.d/50-qubes-misc.rules
 %config(noreplace) /etc/udev/rules.d/99-qubes-network.rules
 /etc/xdg/autostart/00-qubes-show-hide-nm-applet.desktop
-/etc/xdg/nautilus-actions/nautilus-actions.conf
 /etc/xen/scripts/vif-route-qubes
 %config(noreplace) /etc/yum.conf.d/qubes-proxy.conf
 %config(noreplace) /etc/yum.repos.d/qubes-r3.repo
@@ -441,9 +440,10 @@ rm -f %{name}-%{version}
 /usr/share/qubes/serial.conf
 /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override
 /usr/share/glib-2.0/schemas/org.gnome.nautilus.gschema.override
-/usr/share/file-manager/actions/qvm-copy-gnome.desktop
+/usr/share/nautilus-python/extensions/qvm_copy_nautilus.py*
-/usr/share/file-manager/actions/qvm-move-gnome.desktop
+/usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
-/usr/share/file-manager/actions/qvm-dvm-gnome.desktop
+/usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*
+
 %dir /usr/share/qubes
 /usr/share/qubes/mime-override/globs
 %dir /home_volatile