mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:9ba8fb8909c4
+:298263f797be
 }
 return NS_OK;
 }
 //----------------------------------------------------------------------------------------
-@@ -826,28 +845,40 @@ static nsresult pref_InitDefaults()
+@@ -890,24 +909,36 @@ static nsresult pref_InitInitialObjects(
 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
 static const char* specialFiles[] = {
 #if defined(XP_MAC) || defined(XP_MACOSX)
 "macprefs.js"
 #elif defined(XP_WIN)
 "winpref.js"
 #elif defined(XP_UNIX)
 "unix.js"
 +      , "" // placeholder for KDE  (empty is otherwise harmless)
-#if defined(VMS)
+#if defined(_AIX)
-, "openvms.js"
-#elif defined(_AIX)
 , "aix.js"
 #endif
 #elif defined(XP_OS2)
 "os2pref.js"
-#elif defined(XP_BEOS)
-"beos.js"
 #endif
 };
 +  if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper?
 +    for( int i = 0;
-+         i < NS_ARRAY_LENGTH(specialFiles);
++        i < NS_ARRAY_LENGTH(specialFiles);
-+         ++i ) {
++        ++i ) {
 +      if( *specialFiles[ i ] == '\0' ) {
 +        specialFiles[ i ] = "kde.js";
 +        break;
 +      }
 +    }
 rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
 if (NS_FAILED(rv)) {
 NS_WARNING("Error parsing application default preferences.");
 }
-return NS_OK;
+rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST);
-}
+NS_ENSURE_SUCCESS(rv, rv);
 diff --git a/toolkit/components/downloads/src/Makefile.in b/toolkit/components/downloads/src/Makefile.in
 --- a/toolkit/components/downloads/src/Makefile.in
 +++ b/toolkit/components/downloads/src/Makefile.in
 @@ -71,8 +71,9 @@ EXTRA_COMPONENTS = \
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 CPPSRCS += nsNativeAppSupportQt.cpp
 CPPSRCS += nsQAppInstance.cpp
 EXPORTS += nsQAppInstance.h
-ifdef MOZ_ENABLE_MEEGOTOUCH
+else
-MOCSRCS += moc_MozMeegoAppService.cpp
+CPPSRCS += nsNativeAppSupportDefault.cpp
-CPPSRCS += moc_MozMeegoAppService.cpp
+endif
 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/xre/nsKDEUtils.cpp
 @@ -0,0 +1,334 @@
 +
 +};
 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -48,28 +48,31 @@
+@@ -50,28 +50,31 @@
-#include <QDesktopServices>
-#include <QUrl>
 #include <QString>
+#if (MOZ_ENABLE_CONTENTACTION)
 #include <contentaction/contentaction.h>
 #include "nsContentHandlerApp.h"
+#endif
 #endif
 #include "nsMIMEInfoUnix.h"
 -#include "nsGNOMERegistry.h"
 +#include "nsCommonRegistry.h"
 HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nsnull);
 if (action) {
 nsCAutoString spec;
 aURI->GetAsciiSpec(spec);
 if (hildon_uri_open(spec.get(), action, nsnull))
-@@ -91,22 +94,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
+@@ -93,22 +96,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
 return rv;
 }
 NS_IMETHODIMP
 *_retval = PR_TRUE;
 if (*_retval)
 return NS_OK;
-@@ -149,32 +152,49 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -151,32 +154,49 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
 ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
 if (action.isValid()) {
 action.trigger();
 return NS_OK;
 }
 } else if (gnomevfs) {
 diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 @@ -44,17 +44,17 @@
-#if (MOZ_PLATFORM_MAEMO == 6)
+#if defined(MOZ_ENABLE_CONTENTACTION)
 #include <contentaction/contentaction.h>
 #include <QString>
 #endif
 #include "nsOSHelperAppService.h"
 CFLAGS          += $(MOZ_DBUS_CFLAGS)
 CXXFLAGS        += $(MOZ_DBUS_CFLAGS)
 endif
 ifdef MOZ_PLATFORM_MAEMO
-CFLAGS          += $(MOZ_PLATFORM_MAEMO_CFLAGS)
+CFLAGS          += $(MOZ_PLATFORM_MAEMO_CFLAGS) $(MOZ_QT_CFLAGS)
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -91,16 +91,17 @@
+@@ -93,16 +93,17 @@
 #include "prproces.h"
 #include "nsIDirectoryEnumerator.h"
 #include "nsISimpleEnumerator.h"
 #include "nsITimelineService.h"
 #include <Carbon/Carbon.h>
 #include "CocoaFileUtils.h"
 #include "prmem.h"
 #include "plbase64.h"
-@@ -1820,44 +1821,50 @@ nsLocalFile::Launch()
+@@ -1822,44 +1823,50 @@ nsLocalFile::Launch()
 return NS_OK;
 }
 #else
 NS_IMETHODIMP
 nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
 ::CFRelease(url);
 return rv;
 }
 return NS_ERROR_FAILURE;
-@@ -1883,16 +1890,23 @@ nsLocalFile::Launch()
+@@ -1885,16 +1892,23 @@ nsLocalFile::Launch()
 if (nsnull == connection)
 return NS_ERROR_FAILURE;
 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS)

changeset 229	298263f797be
parent 210	f4f4388b26a8
child 236	a4f5954df3a3