Merge lp:~debfx/firefox/firefox-3.6.head into lp:firefox/3.6

[Felix Geyer]

Adapt mozilla-kde.patch for Firefox 3.6.2

=== modified file 'debian/patches/mozilla-kde.patch'
--- debian/patches/mozilla-kde.patch	2010-02-18 08:31:48 +0000
+++ debian/patches/mozilla-kde.patch	2010-03-05 23:23:17 +0000
@@ -1295,7 +1295,7 @@
  {
 -  nsresult rv = nsGNOMERegistry::LoadURL(aURI);
 +  nsresult rv = nsCommonRegistry::LoadURL(aURI);
- #ifdef MOZ_PLATFORM_HILDON
+ #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
    if (NS_FAILED(rv)){
      HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull);
 @@ -102,6 +103,25 @@
@@ -1341,7 +1341,7 @@
    // Check the GConf registry for a protocol handler
 -  *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
 +  *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
- #ifdef MOZ_PLATFORM_HILDON
+ #ifdef MOZ_PLATFORM_MAEMO
    *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
  #endif
 @@ -1219,7 +1219,7 @@ nsresult nsOSHelperAppService::OSProtoco
@@ -1411,7 +1411,7 @@
  #include "nsAccessibilityHelper.h"
 +#include "nsKDEUtils.h"
  
- #ifdef MOZ_PLATFORM_HILDON
+ #ifdef MOZ_PLATFORM_MAEMO
  #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
  #endif