diff -u'Nrpk~' menu-2.1.25~/update-menus/update-menus.cc menu-2.1.25/update-menus/update-menus.cc

--- menu-2.1.25~/update-menus/update-menus.cc	2005-09-17 16:13:56 +0400

+++ menu-2.1.25/update-menus/update-menus.cc	2005-09-17 16:18:38 +0400

@@ -60,6 +60,7 @@ set<string> menufiles_processed;

 set<string> desktopfiles_processed;

 int total_menuentries;

+bool freedesktop=false;

 int verbose=0;

 bool no_fork=false;

 translateinfo *transinfo;

@@ -1142,6 +1143,7 @@ void usage(ostream &c)

   "                         install-menu.\n")

        << _(  /* This is the end of the update-menus --help message*/

   "  -N, --nofork           Prevent update-menus to generate menus in background \n"

+  "  --freedesktop          Use /usr/share/allications desktop-files as menu-files (experimental and tamporary) \n"

   "  --version              Output version information and exit.\n"  );

 }

@@ -1155,6 +1157,7 @@ struct option long_options[] = { 

   { "nodefaultdirs", no_argument, NULL, 'n'},

   { "stdout", no_argument, NULL, 's'},

   { "version", no_argument, NULL, 'V'},

+  { "freedesktop", no_argument, NULL, 'F'},

   { NULL, 0, NULL, 0 } };

@@ -1168,6 +1171,9 @@ void parse_params(int argc, char **argv)

       break;

     switch(c)

     {

+    case 'F':

+        freedesktop=true;

+      break;

     case 'N':

         no_fork=true;

       break;

@@ -1312,7 +1318,8 @@ int main (int argc, char **argv)

     config.desktopfilesdir.push_back(XDGMENUS_GNOME);

     read_menufilesdir(menudata);

-    read_desktopfilesdir(menudata);

+    if( freedesktop )

+	read_desktopfilesdir(menudata);

     if (config.onlyoutput_to_stdout) {

         for(vector<string>::const_iterator i = menudata.begin(); i != menudata.end(); ++i)