3 files changed, 8 insertions, 4 deletions

diff --git a/libmat/parser.py b/libmat/parser.py
index b81b576..73bebdd 100644
--- a/libmat/parser.py
+++ b/libmat/parser.py
@@ -51,7 +51,7 @@ class GenericParser(object):
     def create_backup_copy(self):
         """ Create a backup copy
         """
-        shutil.copy2(self.filename, os.path.join(self.filename, '.bak'))
+        shutil.copy2(self.filename, self.filename + '.bak')
 
     def do_backup(self):
         """ Keep a backup of the file if asked.
@@ -60,7 +60,7 @@ class GenericParser(object):
             but it greatly simplify new strippers implementation.
         """
         if self.backup:
-            shutil.move(self.filename, os.path.join(self.filename, '.bak'))
+            shutil.move(self.filename, self.filename + '.bak')
         else:
             mat.secure_remove(self.filename)
         shutil.move(self.output, self.filename)
diff --git a/mat.desktop b/mat.desktop
index 8bb3c06..e669656 100644
--- a/mat.desktop
+++ b/mat.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Categories=Utility;Security;System;
+Categories=Utility;Security;
 Exec=mat-gui
 GenericName=Metadata Anonymisation Toolkit
 Icon=mat
diff --git a/nautilus/nautilus-mat.py b/nautilus/nautilus-mat.py
index 0974bef..ff102b8 100644
--- a/nautilus/nautilus-mat.py
+++ b/nautilus/nautilus-mat.py
@@ -77,7 +77,7 @@ class MatExtension(GObject.GObject, Nautilus.MenuProvider):
         :param current_file: Name of the selected file
         :param menu: Menu id from which the callback was activated. Unused.
         """
-        if file.is_gone():
+        if current_file.is_gone():
             return
 
         # files url in nautilus are starting with 'file://', of length 7
@@ -93,3 +93,7 @@ class MatExtension(GObject.GObject, Nautilus.MenuProvider):
                 self.show_message(_("Unable to clean %s") % file_path, Gtk.MessageType.ERROR)
         else:
             self.show_message(_("Unable to process %s") % file_path, Gtk.MessageType.ERROR)
+
+    # Workaround https://bugzilla.gnome.org/show_bug.cgi?id=784278
+    def get_background_items(self, window, file):
+        return None