--- a/.fvwm/xdg2fvwm.py	Mon Aug 27 23:30:30 2012 +0300
+++ b/.fvwm/xdg2fvwm.py	Tue Aug 28 17:23:55 2012 +0300
@@ -33,11 +33,11 @@
         elif isinstance(entry, xdg.Menu.MenuEntry):
             desktop = DesktopEntry(entry.DesktopEntry.getFileName())
             icon = desktop.getIcon()
-            ind = icon.rfind('.')
-            if ind != -1:
-                icon = icon[0:ind]
             cmd = desktop.getExec().rstrip('%FUfu')
-            print u'AddToMenu "%s" "%s%%%s.png%%" Exec exec %s' % (name, desktop.getName(), os.path.basename(icon), cmd)
+            if icon == '':
+                print u'AddToMenu "%s" "%s" Exec exec %s' % (name, desktop.getName(), cmd)
+            else:
+                print u'AddToMenu "%s" "%s%%%s%%" Exec exec %s' % (name, desktop.getName(), icon, cmd)
         else:
             pass