--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Data/DownloadMgrUiLib.rss	Thu Aug 19 10:58:56 2010 +0300
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Data/DownloadMgrUiLib.rss	Tue Aug 31 16:17:46 2010 +0300
@@ -20,9 +20,8 @@
 NAME    DMUL
 
 //  INCLUDES
-#include <browser_platform_variant.hrh>
 #include "DownloadMgrUiLib.hrh"
-#include <downloadmgruilib.loc>
+#include <DownloadMgrUiLib.loc>
 #include <avkon.loc>
 #include <badef.rh>
 #include <uikon.rh>
@@ -31,7 +30,7 @@
 #include <avkon.hrh>
 #include <CommonDialogs.rh>
 #include <avkon.rsg>
-#include <PathConfiguration.hrh>
+#include <pathconfiguration.hrh>
 #include <AvkonIcons.hrh>
 #include <avkon.mbg>
 #include <AiwCommon.hrh>
@@ -320,7 +319,7 @@
         MENU_TITLE { menu_pane = r_dmul_downloadslist_menu; txt = ""; }
         };
     }
-#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
+
 RESOURCE MENU_PANE r_dmul_downloadslist_menu
     {
     items =
@@ -340,25 +339,7 @@
         MENU_ITEM { command = EDownloadsListCmdCancelAll; txt = qtn_browser_downloads_cancel_all; }
         };
     }
-#else
-RESOURCE MENU_PANE r_dmul_downloadslist_menu
-    {
-    items =
-        {
-        MENU_ITEM { command = EDownloadsListCmdResumeAll; txt = qtn_browser_downloads_resume_all; },
-        MENU_ITEM { command = EDownloadsListCmdCancelAll; txt = qtn_browser_downloads_cancel_all; }
-        };
-    }
 
-RESOURCE MENU_PANE r_dmul_aiw_popup
-    {
-    items =
-        {
-        MENU_ITEM { command = EAiwCmdContact; txt = qtn_mg_options_assign_to_contact ;  },
-        MENU_ITEM {command = EAiwCmdRingtone;txt = qtn_mg_options_set_as_rt; }
-        };
-    }
-#endif
 STRUCT DMUL_AIW_INTEREST_MENUPANE_MAPPING_LIST
     {
     STRUCT pairs[];
@@ -382,22 +363,6 @@
     {
     items=
         {
-#ifdef BRDO_SINGLE_CLICK_ENABLED_FF                
-        AIW_CRITERIA_ITEM
-            {
-            id = EAiwCmdRingtone;
-            serviceCmd = KAiwCmdAssign;
-            contentType = "*";
-            serviceClass = KAiwClassMenu;
-            },
-        AIW_CRITERIA_ITEM
-           {
-           id = EAiwCmdContact;
-           serviceCmd = KAiwCmdAssign;
-           contentType = "*";
-           serviceClass = KAiwClassMenu;
-           }
-#else
         AIW_CRITERIA_ITEM
             {
             id = EDownloadsListCmdUseAs;
@@ -405,7 +370,6 @@
             contentType = "*";
             serviceClass = KAiwClassMenu;
             }
-#endif            
         };
     }
 
@@ -416,11 +380,7 @@
         DMUL_AIW_INTEREST_MENUPANE_PAIR
             {
             interest = r_dmul_aiw_use_as_interest;
-#ifdef  BRDO_SINGLE_CLICK_ENABLED_FF       
-            menupane = r_dmul_aiw_popup;
-#else
             menupane = r_dmul_downloadslist_menu;
-#endif            
             }
         };
     }
@@ -530,20 +490,6 @@
         };
     }
 
-#ifdef BRDO_SINGLE_CLICK_ENABLED_FF
-RESOURCE STYLUS_POPUP_MENU r_stylus_long_tap_popup_dl_menu
-    {       
-    items =     
-        {
-        STYLUS_POPUP_MENU_ITEM { txt = qtn_browser_downloads_delete; command = EDownloadsListCmdDelete;},
-        STYLUS_POPUP_MENU_ITEM {  txt = qtn_browser_downloads_set_as_rt; command = EAiwCmdRingtone; },
-        STYLUS_POPUP_MENU_ITEM {  txt =  qtn_browser_downloads_assign_to_contact ; command = EAiwCmdContact ; },
-        STYLUS_POPUP_MENU_ITEM { txt = qtn_browser_downloads_open_file_manager; command = EDownloadsListCmdFileManager;},
-        STYLUS_POPUP_MENU_ITEM { txt = qtn_browser_downloads_cancel_download; command = EDownloadsListCmdCancel;},
-        STYLUS_POPUP_MENU_ITEM { txt = qtn_browser_downloads_resume; command = EDownloadsListCmdResume;}
-        };
-    }
-#endif    
 // End of File