Mozilla Firefox

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

  1. firefox-3.6.head
  2. Merge into firefox-3.6.head
Proposed by Felix Geyer
Status: Merged
Merged at revision: not available
Proposed branch: lp:~debfx/firefox/firefox-3.6.head
Merge into: lp:firefox/3.6
Diff against target: 29 lines (+3/-3)
1 file modified
debian/patches/mozilla-kde.patch (+3/-3)
To merge this branch: bzr merge lp:~debfx/firefox/firefox-3.6.head
Reviewer Review Type Date Requested Status
Micah Gersten Pending
Review via email: mp+20791@code.launchpad.net

Description of the change

Adapt mozilla-kde.patch for Firefox 3.6.2

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/mozilla-kde.patch'
2--- debian/patches/mozilla-kde.patch 2010-02-18 08:31:48 +0000
3+++ debian/patches/mozilla-kde.patch 2010-03-05 23:23:17 +0000
4@@ -1295,7 +1295,7 @@
5 {
6 - nsresult rv = nsGNOMERegistry::LoadURL(aURI);
7 + nsresult rv = nsCommonRegistry::LoadURL(aURI);
8- #ifdef MOZ_PLATFORM_HILDON
9+ #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
10 if (NS_FAILED(rv)){
11 HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull);
12 @@ -102,6 +103,25 @@
13@@ -1341,7 +1341,7 @@
14 // Check the GConf registry for a protocol handler
15 - *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
16 + *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
17- #ifdef MOZ_PLATFORM_HILDON
18+ #ifdef MOZ_PLATFORM_MAEMO
19 *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
20 #endif
21 @@ -1219,7 +1219,7 @@ nsresult nsOSHelperAppService::OSProtoco
22@@ -1411,7 +1411,7 @@
23 #include "nsAccessibilityHelper.h"
24 +#include "nsKDEUtils.h"
25
26- #ifdef MOZ_PLATFORM_HILDON
27+ #ifdef MOZ_PLATFORM_MAEMO
28 #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
29 #endif
30

Subscribers

People subscribed via source and target branches