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
=== 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 @@
1295 {1295 {
1296- nsresult rv = nsGNOMERegistry::LoadURL(aURI);1296- nsresult rv = nsGNOMERegistry::LoadURL(aURI);
1297+ nsresult rv = nsCommonRegistry::LoadURL(aURI);1297+ nsresult rv = nsCommonRegistry::LoadURL(aURI);
1298 #ifdef MOZ_PLATFORM_HILDON1298 #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
1299 if (NS_FAILED(rv)){1299 if (NS_FAILED(rv)){
1300 HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull);1300 HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull);
1301@@ -102,6 +103,25 @@1301@@ -102,6 +103,25 @@
@@ -1341,7 +1341,7 @@
1341 // Check the GConf registry for a protocol handler1341 // Check the GConf registry for a protocol handler
1342- *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);1342- *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
1343+ *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);1343+ *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
1344 #ifdef MOZ_PLATFORM_HILDON1344 #ifdef MOZ_PLATFORM_MAEMO
1345 *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);1345 *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
1346 #endif1346 #endif
1347@@ -1219,7 +1219,7 @@ nsresult nsOSHelperAppService::OSProtoco1347@@ -1219,7 +1219,7 @@ nsresult nsOSHelperAppService::OSProtoco
@@ -1411,7 +1411,7 @@
1411 #include "nsAccessibilityHelper.h"1411 #include "nsAccessibilityHelper.h"
1412+#include "nsKDEUtils.h"1412+#include "nsKDEUtils.h"
1413 1413
1414 #ifdef MOZ_PLATFORM_HILDON1414 #ifdef MOZ_PLATFORM_MAEMO
1415 #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>1415 #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
1416 #endif1416 #endif
1417 1417

Subscribers

People subscribed via source and target branches