--- MenuHandler.py.org  2005-06-03 20:18:35.000000000 +0200
+++ MenuHandler.py      2005-06-03 20:21:01.000000000 +0200
@@ -164,15 +164,21 @@
                 entry.Parent = menu
                 yield entry

-    def copyAppDirs(self, oldparent, newparent):
-        master = self.menu.AppDirs
+    def copyAppDirs(self, oldparent, newparent, menu=None):
+               if menu:
+                       master = menu.AppDirs
+               else:
+               master = self.menu.AppDirs
         new_menu = self._MenuEditor__getXmlMenu(newparent.getPath(True, True))
         for appdir in oldparent.AppDirs:
             if appdir not in master and appdir not in newparent.AppDirs:
                 self._MenuEditor__addXmlTextElement(new_menu, 'AppDir', appdir)

-    def copyDirectoryDirs(self, oldparent, newparent):
-        master = self.menu.DirectoryDirs
+    def copyDirectoryDirs(self, oldparent, newparent=None,menu):
+               if menu:
+                       master = menu.DirectoryDirs
+               else:
+                       master = self.menu.DirectoryDirs
         new_menu = self._MenuEditor__getXmlMenu(newparent.getPath(True, True))
         for dirdir in oldparent.DirectoryDirs:
             if dirdir not in master and dirdir not in newparent.DirectoryDirs:
@@ -217,8 +223,8 @@
                 return False
         xdg.MenuEditor.MenuEditor.moveMenu(self, menu, oldparent, newparent, after, before)
         if oldparent != newparent:
-            self.copyAppDirs(oldparent, newparent)
-            self.copyDirectoryDirs(oldparent, newparent)
+            self.copyAppDirs(oldparent, newparent, menu)
+            self.copyDirectoryDirs(oldparent, newparent, menu)
         return True

     def moveSeparator(self, separator, parent, before=None, after=None):