Commits

Anonymous committed 8ea073a Merge

Merge PRC1 -> NB#189938

Comments (0)

Files changed (3)

 3717c84a3d6f3417c1ef6f12e63d8253169d5206 debian-4.0b3pre.2852.3748d55343cd-xr52
 8a5732f6f65c63be40fb9c992b154b293acca24e debian-4.0b3pre.2852.3748d55343cd-xr53
 fd44e9e76dc6b9223d9a59e30f7e617c15106e33 debian-4.0b3pre.2852.3748d55343cd-xr51.1
+65b5e0015db3859e50f9aa2c6089e1535d238518 debian-4.0b3pre.2852.3748d55343cd-xr54
+ac8fb45ed52b2a056201cd9208524c3cb0aa5ea7 debian-4.0b3pre.2852.3748d55343cd-xr55

chrome/content/browser.xul

             <box id="toolbar-container" class="panel-dark toolbar-height">
               <box id="toolbar-moveable-container">
                 <toolbar id="toolbar-main" class="panel-dark window-width">
-#ifdef MOZ_PLATFORM_MAEMO
+#if MOZ_PLATFORM_MAEMO != 6
                   <toolbarbutton id="tool-app-switch" oncommand="BrowserUI.switchTask();"/>
 #endif
                   <hbox id="urlbar-container" flex="1" observes="bcast_urlbarState">
                     </hbox>
                   </hbox>
 #ifndef ANDROID
+#if MOZ_PLATFORM_MAEMO != 6
                   <toolbarbutton id="tool-app-close" class="urlbar-button" command="cmd_close"/>
 #endif
+#endif
                 </toolbar>
               </box>
             </box>
-fennec (4.0b3pre.2852.3748d55343cd-xr55~0bug189938) unstable; urgency=low
+fennec (4.0b3pre.2852.3748d55343cd-xr56~0bug189938) unstable; urgency=low
 
   * Merge PRC1 -> NB#189938
 
  -- Tuukka Tolvanen <tuukka.tolvanen@nokia.com>  Wed, 12 Jan 2011 19:44:37 +0200
 
+fennec (4.0b3pre.2852.3748d55343cd-xr55) unstable; urgency=low
+
+  * Fixes: NB#218608 Home and App button should be disabled for Harmattan
+
+ -- Oleg Romashin <oleg.romashin@nokia.com>  Wed, 12 Jan 2011 17:49:16 +0200
+
 fennec (4.0b3pre.2852.3748d55343cd-xr54) unstable; urgency=low
 
   * Fixes: NB#216519 - Drop selectedSkin