mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:55fe9dc16b1f
+:830e50bbfc79
 #include "pldhash.h"
 #include "prefapi.h"
 #include "prefread.h"
 #include "prefapi_private_data.h"
-@@ -907,16 +908,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -896,16 +897,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
 static nsresult pref_LoadPrefsInDirList(const char *listId)
 {
 nsresult rv;
 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
 getter_AddRefs(list));
 if (!list)
 return NS_OK;
 bool hasMore;
-@@ -932,17 +951,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -921,17 +940,17 @@ static nsresult pref_LoadPrefsInDirList(
 nsCAutoString leaf;
 path->GetNativeLeafName(leaf);
 // Do we care if a file provided by this process fails to load?
 if (Substring(leaf, leaf.Length() - 4).Equals(NS_LITERAL_CSTRING(".xpi")))
 ReadExtensionPrefs(path);
 else
--      pref_LoadPrefsInDir(path, nsnull, 0);
+-      pref_LoadPrefsInDir(path, nullptr, 0);
 +      pref_LoadPrefsInDir(path, specialFiles, NS_ARRAY_LENGTH(specialFiles));
 }
 return NS_OK;
 }
 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
 {
 nsZipItemPtr<char> manifest(jarReader, name, true);
 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1036,28 +1055,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1025,28 +1044,40 @@ 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_MACOSX)
 "macprefs.js"
 #elif defined(XP_WIN)
 +          GetDisplayName( displayName );
 +          command.AppendElement( nsCAutoString( ToNewUTF8String( displayName )));
 +          nsKDEUtils::command( command );
 +        } else {
 +        // begin non-KDE block
-PRInt32 alertInterval = 2000;
+int32_t alertInterval = 2000;
 if (pref)
 pref->GetIntPref(PREF_BDM_SHOWALERTINTERVAL, &alertInterval);
-PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
+int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
-PRInt64 goat = PR_Now() - mStartTime;
+int64_t goat = PR_Now() - mStartTime;
 showTaskbarAlert = goat > alertIntervalUSec;
 @@ -2266,19 +2279,20 @@ nsDownload::SetState(DownloadState aStat
 // If downloads are automatically removed per the user's
 // retention policy, there's no reason to make the text clickable
 +#    PrefWindow I   (June 4, 1999)
 +#
 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -12,16 +12,18 @@
+@@ -13,16 +13,19 @@
-#include "nsArrayUtils.h"
 #include "prnetdb.h"
 #include "prenv.h"
 #include "nsPrintfCString.h"
 #include "nsNetUtil.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIGSettingsService.h"
 #include "nsInterfaceHashtable.h"
+#include "mozilla/Attributes.h"
 +#include "nsVoidArray.h"
 +#include "nsKDEUtils.h"
++
-class nsUnixSystemProxySettings : public nsISystemProxySettings {
+class nsUnixSystemProxySettings MOZ_FINAL : public nsISystemProxySettings {
 public:
 NS_DECL_ISUPPORTS
 NS_DECL_NSISYSTEMPROXYSETTINGS
 nsUnixSystemProxySettings() {}
 nsresult Init();
-@@ -33,16 +35,17 @@ private:
+@@ -34,16 +37,17 @@ private:
 nsCOMPtr<nsIGSettingsService> mGSettings;
 nsCOMPtr<nsIGSettingsCollection> mProxySettings;
 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
 bool IsProxyMode(const char* aMode);
 nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult);
-nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
+nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);
-nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
+nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);
 nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);
 +  nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
 };
 NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
 nsresult
 nsUnixSystemProxySettings::Init()
 {
 // If this is a GNOME session, load gconf and try to use its preferences.
-@@ -495,16 +498,19 @@ nsUnixSystemProxySettings::GetProxyForUR
+@@ -496,16 +500,19 @@ nsUnixSystemProxySettings::GetProxyForUR
 nsCAutoString host;
 rv = aURI->GetHost(host);
 NS_ENSURE_SUCCESS(rv, rv);
-PRInt32 port;
+int32_t port;
 rv = aURI->GetPort(&port);
 NS_ENSURE_SUCCESS(rv, rv);
 +  if( nsKDEUtils::kdeSupport())
 +    return GetProxyFromKDE(scheme, host, port, aResult);
 return rv;
 }
 if (mGConf)
 return GetProxyFromGConf(scheme, host, port, aResult);
-@@ -530,8 +536,34 @@ static const mozilla::Module::ContractID
+@@ -531,8 +538,34 @@ static const mozilla::Module::ContractID
 static const mozilla::Module kUnixProxyModule = {
 mozilla::Module::kVersion,
 kUnixProxyCIDs,
 kUnixProxyContracts
 +    nsTArray<nsCString> output;
 +    if( nsKDEUtils::command( command, &output ) && output.Length() == 3 )
 +        {
 +        nsCString mimetype = output[ 0 ];
 +        nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix( mimetype );
-+        NS_ENSURE_TRUE(mimeInfo, nsnull);
++        NS_ENSURE_TRUE(mimeInfo, nullptr);
 +        nsCString description = output[ 1 ];
 +        mimeInfo->SetDescription(NS_ConvertUTF8toUTF16(description));
 +        nsCString handlerAppName = output[ 2 ];
 +        mimeInfo->SetDefaultDescription(NS_ConvertUTF8toUTF16(handlerAppName));
 +        mimeInfo->SetPreferredAction(nsIMIMEInfo::useSystemDefault);
 +        nsMIMEInfoBase* retval;
 +        NS_ADDREF((retval = mimeInfo));
 +        return retval;
 +        }
-+    return nsnull;
++    return nullptr;
 +}
 diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h
 new file mode 100644
 --- /dev/null
 +++ b/uriloader/exthandler/unix/nsKDERegistry.h
 -  nsresult rv = nsGNOMERegistry::LoadURL(aURI);
 +  nsresult rv = nsCommonRegistry::LoadURL(aURI);
 #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
 if (NS_FAILED(rv)){
-HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nsnull);
+HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nullptr);
 if (action) {
 nsCAutoString spec;
 aURI->GetAsciiSpec(spec);
-if (hildon_uri_open(spec.get(), action, nsnull))
+if (hildon_uri_open(spec.get(), action, nullptr))
 @@ -61,22 +64,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
 return rv;
 }
 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
 majorType,
 @@ -1391,17 +1391,17 @@ nsOSHelperAppService::GetFromType(const
 #ifdef MOZ_WIDGET_GTK2
-nsMIMEInfoBase *gnomeInfo = nsnull;
+nsMIMEInfoBase *gnomeInfo = nullptr;
 if (handler.IsEmpty()) {
 // No useful data yet.  Check the GNOME registry.  Unfortunately, newer
 // GNOME versions no longer have type-to-extension mappings, so we might
 // get back a MIMEInfo without any extensions set.  In that case we'll have
 // to look in our mime.types files for the extensions.
 #endif
 using namespace mozilla;
 #define MAX_PREVIEW_SIZE 180
-@@ -252,17 +254,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
+@@ -264,17 +266,19 @@ nsFilePicker::AppendFilters(int32_t aFil
 return nsBaseFilePicker::AppendFilters(aFilterMask);
 }
 NS_IMETHODIMP
 nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter)
 CopyUTF16toUTF8(aFilter, filter);
 CopyUTF16toUTF8(aTitle, name);
 mFilters.AppendElement(filter);
 mFilterNames.AppendElement(name);
-@@ -357,16 +361,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
+@@ -369,16 +373,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
 return NS_ERROR_FAILURE;
 }
 NS_IMETHODIMP
-nsFilePicker::Show(PRInt16 *aReturn)
+nsFilePicker::Show(int16_t *aReturn)
 {
 NS_ENSURE_ARG_POINTER(aReturn);
 +  if( nsKDEUtils::kdeSupport())
 +    return kdeFileDialog(aReturn);
 +
-nsXPIDLCString title;
+nsresult rv = Open(nullptr);
-title.Adopt(ToNewUTF8String(mTitle));
+if (NS_FAILED(rv))
+return rv;
-GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget);
+while (mRunning) {
-GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
+g_main_context_iteration(nullptr, TRUE);
-const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-? GTK_STOCK_SAVE : GTK_STOCK_OPEN;
-@@ -505,8 +512,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
-*aReturn = nsIFilePicker::returnCancel;
-break;
 }
-gtk_widget_destroy(file_chooser);
+@@ -587,8 +594,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+if (mCallback) {
-return NS_OK;
+mCallback->Done(result);
+mCallback = nullptr;
+} else {
+mResult = result;
+}
+NS_RELEASE_THIS();
 }
 +
 +nsCString nsFilePicker::kdeMakeFilter( int index )
 +    {
 +    nsCString buf = mFilters[ index ];
 +        {
 +        *aReturn = nsIFilePicker::returnCancel;
 +        }
 +    return NS_OK;
 +    }
++
 diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
 --- a/widget/gtk2/nsFilePicker.h
 +++ b/widget/gtk2/nsFilePicker.h
-@@ -57,11 +57,17 @@ protected:
+@@ -67,11 +67,17 @@ protected:
 nsString  mDefault;
 nsString  mDefaultExtension;
 nsTArray<nsCString> mFilters;
 nsTArray<nsCString> mFilterNames;
 return rv;
 }
 return NS_ERROR_FAILURE;
 @@ -1823,16 +1831,23 @@ nsLocalFile::Launch()
-if (nsnull == connection)
+if (nullptr == connection)
 return NS_ERROR_FAILURE;
 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS)
 return NS_ERROR_FAILURE;
 return NS_OK;

changeset 541	830e50bbfc79
parent 538	be682f8c9361
child 546	2c9448fe783c