diff -urdN qdigidoc4-4.2.2-orig/extensions/nautilus/nautilus-qdigidoc.py.cmake qdigidoc4-4.2.2/extensions/nautilus/nautilus-qdigidoc.py.cmake
--- qdigidoc4-4.2.2-orig/extensions/nautilus/nautilus-qdigidoc.py.cmake	2019-07-22 13:58:01.000000000 +0200
+++ qdigidoc4-4.2.2/extensions/nautilus/nautilus-qdigidoc.py.cmake	2019-07-27 18:21:03.093138000 +0200
@@ -18,10 +18,13 @@
 # Foundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 import os
-import urllib
+import urllib.parse
 import gettext
 import locale
 
+import gi
+gi.require_version('Nautilus', '3.0')
+
 from gi.repository import Nautilus, GObject, Gio
 
 APP = 'nautilus-qdigidoc'
@@ -32,13 +35,14 @@
 
 class OpenDigidocExtension(GObject.GObject, Nautilus.MenuProvider):
     def __init__(self):
+        GObject.Object.__init__(self)
         pass
 
     def menu_activate_cb(self, menu, paths):
         args = "-sign "
         for path in paths:
             args += "\"%s\" " % path
-        cmd = ("${DIGIDOC_EXECUTABLE} " + args + "&")
+        cmd = ("qdigidoc4 " + args + "&")
         os.system(cmd)
 
     def valid_file(self, file):
@@ -48,7 +52,7 @@
         paths = []
         for file in files:
             if self.valid_file(file):
-                path = urllib.unquote(file.get_uri()[7:])
+                path = urllib.parse.unquote(file.get_uri()[7:])
                 paths.append(path)
 
         if len(paths) < 1:
@@ -57,23 +61,24 @@
         item = Nautilus.MenuItem(
             name="OpenDigidocExtension::DigidocSigner",
             label=gettext.gettext('Sign digitally'),
-            tip=gettext.ngettext('Sign selected file with ${DIGIDOC_NAME} Client',
-                                 'Sign selected files with ${DIGIDOC_NAME} Client',
+            tip=gettext.ngettext('Sign selected file with DigiDoc4 Client',
+                                 'Sign selected files with DigiDoc4 Client',
                                  len(paths)),
-            icon='${DIGIDOC_ICON}'
+            icon='qdigidoc4'
         )
         item.connect('activate', self.menu_activate_cb, paths)
         return item,
 
 class OpenCryptoExtension(GObject.GObject, Nautilus.MenuProvider):
     def __init__(self):
+        GObject.Object.__init__(self)
         pass
 
     def menu_activate_cb(self, menu, paths):
         args = "-crypto "
         for path in paths:
             args += "\"%s\" " % path
-        cmd = ("${DIGIDOC_EXECUTABLE} " + args + "&")
+        cmd = ("qdigidoc4 " + args + "&")
         os.system(cmd)
 
     def valid_file(self, file):
@@ -83,7 +88,7 @@
         paths = []
         for file in files:
             if self.valid_file(file):
-                path = urllib.unquote(file.get_uri()[7:])
+                path = urllib.parse.unquote(file.get_uri()[7:])
                 paths.append(path)
 
         if len(paths) < 1:
@@ -92,10 +97,10 @@
         item = Nautilus.MenuItem(
             name="OpenCryptoExtension::DigidocEncrypter",
             label=gettext.gettext('Encrypt files'),
-            tip=gettext.ngettext('Encrypt selected file with ${DIGIDOC_NAME} Client',
-                                 'Encrypt selected files with ${DIGIDOC_NAME} Client',
+            tip=gettext.ngettext('Encrypt selected file with DigiDoc4 Client',
+                                 'Encrypt selected files with DigiDoc4 Client',
                                  len(paths)),
-            icon='${DIGIDOC_ICON}'
+            icon='qdigidoc4'
         )
         item.connect('activate', self.menu_activate_cb, paths)
         return item,