24 libs:: greprefs.js |
24 libs:: greprefs.js |
25 $(INSTALL) $^ $(DIST)/bin/ |
25 $(INSTALL) $^ $(DIST)/bin/ |
26 diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp |
26 diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp |
27 --- a/modules/libpref/src/Preferences.cpp |
27 --- a/modules/libpref/src/Preferences.cpp |
28 +++ b/modules/libpref/src/Preferences.cpp |
28 +++ b/modules/libpref/src/Preferences.cpp |
29 @@ -23,16 +23,17 @@ |
29 @@ -24,16 +24,17 @@ |
30 #include "nsIStringEnumerator.h" |
30 #include "nsIStringEnumerator.h" |
31 #include "nsIZipReader.h" |
31 #include "nsIZipReader.h" |
32 #include "nsPrefBranch.h" |
32 #include "nsPrefBranch.h" |
33 #include "nsXPIDLString.h" |
33 #include "nsXPIDLString.h" |
34 #include "nsCRT.h" |
34 #include "nsCRT.h" |
42 |
42 |
43 #include "prefapi.h" |
43 #include "prefapi.h" |
44 #include "prefread.h" |
44 #include "prefread.h" |
45 #include "prefapi_private_data.h" |
45 #include "prefapi_private_data.h" |
46 |
46 |
47 @@ -972,16 +973,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
47 @@ -973,16 +974,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
48 |
48 |
49 static nsresult pref_LoadPrefsInDirList(const char *listId) |
49 static nsresult pref_LoadPrefsInDirList(const char *listId) |
50 { |
50 { |
51 nsresult rv; |
51 nsresult rv; |
52 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
52 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
77 getter_AddRefs(list)); |
77 getter_AddRefs(list)); |
78 if (!list) |
78 if (!list) |
79 return NS_OK; |
79 return NS_OK; |
80 |
80 |
81 bool hasMore; |
81 bool hasMore; |
82 @@ -997,17 +1016,17 @@ static nsresult pref_LoadPrefsInDirList( |
82 @@ -998,17 +1017,17 @@ static nsresult pref_LoadPrefsInDirList( |
83 |
83 |
84 nsAutoCString leaf; |
84 nsAutoCString leaf; |
85 path->GetNativeLeafName(leaf); |
85 path->GetNativeLeafName(leaf); |
86 |
86 |
87 // Do we care if a file provided by this process fails to load? |
87 // Do we care if a file provided by this process fails to load? |
96 |
96 |
97 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
97 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
98 { |
98 { |
99 nsZipItemPtr<char> manifest(jarReader, name, true); |
99 nsZipItemPtr<char> manifest(jarReader, name, true); |
100 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
100 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
101 @@ -1101,28 +1120,40 @@ static nsresult pref_InitInitialObjects( |
101 @@ -1102,28 +1121,40 @@ static nsresult pref_InitInitialObjects( |
102 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
102 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
103 static const char* specialFiles[] = { |
103 static const char* specialFiles[] = { |
104 #if defined(XP_MACOSX) |
104 #if defined(XP_MACOSX) |
105 "macprefs.js" |
105 "macprefs.js" |
106 #elif defined(XP_WIN) |
106 #elif defined(XP_WIN) |
182 self.base = base |
182 self.base = base |
183 self.flags = Flags(*flags) |
183 self.flags = Flags(*flags) |
184 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in |
184 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in |
185 --- a/toolkit/components/downloads/Makefile.in |
185 --- a/toolkit/components/downloads/Makefile.in |
186 +++ b/toolkit/components/downloads/Makefile.in |
186 +++ b/toolkit/components/downloads/Makefile.in |
187 @@ -23,9 +23,11 @@ ifndef MOZ_SUITE |
187 @@ -11,13 +11,15 @@ VPATH = @srcdir@ |
188 DISABLED_EXTRA_COMPONENTS = \ |
188 include $(DEPTH)/config/autoconf.mk |
189 nsDownloadManagerUI.js \ |
189 |
190 nsDownloadManagerUI.manifest \ |
190 LIBRARY_NAME = download_s |
|
191 LIBXUL_LIBRARY = 1 |
|
192 FAIL_ON_WARNINGS = 1 |
|
193 |
|
194 include $(topsrcdir)/config/rules.mk |
|
195 |
|
196 + |
|
197 CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI |
|
198 |
|
199 LOCAL_INCLUDES += \ |
|
200 -I$(srcdir)/../protobuf \ |
|
201 + -I$(topsrcdir)/toolkit/xre \ |
191 $(NULL) |
202 $(NULL) |
192 endif |
|
193 |
|
194 include $(topsrcdir)/config/rules.mk |
|
195 |
|
196 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
|
197 + |
|
198 CXXFLAGS += $(TK_CFLAGS) |
|
199 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
203 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
200 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
204 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
201 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
205 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
202 @@ -38,16 +38,20 @@ |
206 @@ -38,16 +38,20 @@ |
203 |
207 |
2622 + |
2626 + |
2623 +#endif // nsKDEUtils |
2627 +#endif // nsKDEUtils |
2624 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2628 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2625 --- a/uriloader/exthandler/Makefile.in |
2629 --- a/uriloader/exthandler/Makefile.in |
2626 +++ b/uriloader/exthandler/Makefile.in |
2630 +++ b/uriloader/exthandler/Makefile.in |
2627 @@ -86,9 +86,10 @@ EXTRA_COMPONENTS = \ |
2631 @@ -77,9 +77,10 @@ endif |
2628 # we don't want the shared lib, but we want to force the creation of a static lib. |
2632 endif |
2629 FORCE_STATIC_LIB = 1 |
2633 |
2630 include $(topsrcdir)/config/config.mk |
2634 include $(topsrcdir)/config/config.mk |
|
2635 include $(topsrcdir)/config/rules.mk |
2631 include $(topsrcdir)/ipc/chromium/chromium-config.mk |
2636 include $(topsrcdir)/ipc/chromium/chromium-config.mk |
2632 include $(topsrcdir)/config/rules.mk |
|
2633 |
2637 |
2634 ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT))) |
2638 ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT))) |
2635 CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) |
2639 CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) |
2636 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
2640 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
2637 endif |
2641 endif |
3081 |
3085 |
3082 // Now look up our extensions |
3086 // Now look up our extensions |
3083 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in |
3087 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in |
3084 --- a/widget/gtk2/Makefile.in |
3088 --- a/widget/gtk2/Makefile.in |
3085 +++ b/widget/gtk2/Makefile.in |
3089 +++ b/widget/gtk2/Makefile.in |
3086 @@ -67,11 +67,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' |
3090 @@ -68,11 +68,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' |
3087 |
3091 |
3088 INCLUDES += \ |
3092 INCLUDES += \ |
3089 -I$(srcdir)/../xpwidgets \ |
3093 -I$(srcdir)/../xpwidgets \ |
3090 -I$(srcdir)/../shared \ |
3094 -I$(srcdir)/../shared \ |
3091 -I$(topsrcdir)/layout/generic \ |
3095 -I$(topsrcdir)/layout/generic \ |
3099 INCLUDES += -I$(srcdir)/../shared/x11 |
3103 INCLUDES += -I$(srcdir)/../shared/x11 |
3100 endif |
3104 endif |
3101 diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp |
3105 diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp |
3102 --- a/widget/gtk2/nsFilePicker.cpp |
3106 --- a/widget/gtk2/nsFilePicker.cpp |
3103 +++ b/widget/gtk2/nsFilePicker.cpp |
3107 +++ b/widget/gtk2/nsFilePicker.cpp |
3104 @@ -1,31 +1,33 @@ |
3108 @@ -1,32 +1,34 @@ |
3105 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
3109 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
3106 /* This Source Code Form is subject to the terms of the Mozilla Public |
3110 /* This Source Code Form is subject to the terms of the Mozilla Public |
3107 * License, v. 2.0. If a copy of the MPL was not distributed with this |
3111 * License, v. 2.0. If a copy of the MPL was not distributed with this |
3108 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
3112 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
3109 |
3113 |
3110 #include "mozilla/Util.h" |
3114 #include "mozilla/Util.h" |
3111 |
3115 |
3112 #include <gtk/gtk.h> |
3116 #include <gtk/gtk.h> |
3113 +#include <gdk/gdkx.h> |
3117 +#include <gdk/gdkx.h> |
3114 |
3118 |
|
3119 #include "nsGtkUtils.h" |
3115 #include "nsIFileURL.h" |
3120 #include "nsIFileURL.h" |
3116 #include "nsIURI.h" |
3121 #include "nsIURI.h" |
3117 #include "nsIWidget.h" |
3122 #include "nsIWidget.h" |
3118 #include "nsIFile.h" |
3123 #include "nsIFile.h" |
3119 #include "nsIStringBundle.h" |
3124 #include "nsIStringBundle.h" |
3133 #endif |
3138 #endif |
3134 |
3139 |
3135 using namespace mozilla; |
3140 using namespace mozilla; |
3136 |
3141 |
3137 #define MAX_PREVIEW_SIZE 180 |
3142 #define MAX_PREVIEW_SIZE 180 |
3138 @@ -242,17 +244,19 @@ nsFilePicker::AppendFilters(int32_t aFil |
3143 @@ -232,17 +234,19 @@ nsFilePicker::AppendFilters(int32_t aFil |
3139 return nsBaseFilePicker::AppendFilters(aFilterMask); |
3144 return nsBaseFilePicker::AppendFilters(aFilterMask); |
3140 } |
3145 } |
3141 |
3146 |
3142 NS_IMETHODIMP |
3147 NS_IMETHODIMP |
3143 nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter) |
3148 nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter) |
3154 CopyUTF16toUTF8(aFilter, filter); |
3159 CopyUTF16toUTF8(aFilter, filter); |
3155 CopyUTF16toUTF8(aTitle, name); |
3160 CopyUTF16toUTF8(aTitle, name); |
3156 |
3161 |
3157 mFilters.AppendElement(filter); |
3162 mFilters.AppendElement(filter); |
3158 mFilterNames.AppendElement(name); |
3163 mFilterNames.AppendElement(name); |
3159 @@ -366,16 +370,32 @@ nsFilePicker::Show(int16_t *aReturn) |
3164 @@ -356,16 +360,32 @@ nsFilePicker::Show(int16_t *aReturn) |
3160 |
3165 |
3161 NS_IMETHODIMP |
3166 NS_IMETHODIMP |
3162 nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) |
3167 nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) |
3163 { |
3168 { |
3164 // Can't show two dialogs concurrently with the same filepicker |
3169 // Can't show two dialogs concurrently with the same filepicker |
3187 GtkWindow *parent_widget = |
3192 GtkWindow *parent_widget = |
3188 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
3193 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
3189 |
3194 |
3190 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
3195 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
3191 const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) |
3196 const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) |
3192 @@ -567,8 +587,235 @@ nsFilePicker::Done(GtkWidget* file_choos |
3197 @@ -553,8 +573,235 @@ nsFilePicker::Done(GtkWidget* file_choos |
3193 if (mCallback) { |
3198 if (mCallback) { |
3194 mCallback->Done(result); |
3199 mCallback->Done(result); |
3195 mCallback = nullptr; |
3200 mCallback = nullptr; |
3196 } else { |
3201 } else { |
3197 mResult = result; |
3202 mResult = result; |
3447 |
3452 |
3448 #endif |
3453 #endif |
3449 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in |
3454 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in |
3450 --- a/xpcom/components/Makefile.in |
3455 --- a/xpcom/components/Makefile.in |
3451 +++ b/xpcom/components/Makefile.in |
3456 +++ b/xpcom/components/Makefile.in |
3452 @@ -28,9 +28,10 @@ LOCAL_INCLUDES = \ |
3457 @@ -23,9 +23,10 @@ LOCAL_INCLUDES = \ |
3453 FORCE_STATIC_LIB = 1 |
3458 -I$(topsrcdir)/chrome/src \ |
|
3459 -I$(topsrcdir)/modules/libjar \ |
|
3460 $(NULL) |
3454 |
3461 |
3455 include $(topsrcdir)/config/rules.mk |
3462 include $(topsrcdir)/config/rules.mk |
3456 |
|
3457 DEFINES += -D_IMPL_NS_COM |
|
3458 |
3463 |
3459 ifdef MOZ_WIDGET_GTK |
3464 ifdef MOZ_WIDGET_GTK |
3460 CXXFLAGS += $(TK_CFLAGS) |
3465 CXXFLAGS += $(TK_CFLAGS) |
3461 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
3466 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
3462 endif |
3467 endif |
3592 if (directive->regfunc) { |
3597 if (directive->regfunc) { |
3593 if (GeckoProcessType_Default != XRE_GetProcessType()) |
3598 if (GeckoProcessType_Default != XRE_GetProcessType()) |
3594 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3599 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3595 --- a/xpcom/io/Makefile.in |
3600 --- a/xpcom/io/Makefile.in |
3596 +++ b/xpcom/io/Makefile.in |
3601 +++ b/xpcom/io/Makefile.in |
3597 @@ -43,17 +43,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3602 @@ -26,17 +26,17 @@ include $(topsrcdir)/config/rules.mk |
3598 DEFINES += -D_IMPL_NS_COM |
3603 include $(topsrcdir)/ipc/chromium/chromium-config.mk |
3599 |
3604 |
3600 ifeq ($(OS_ARCH),Linux) |
3605 ifeq ($(OS_ARCH),Linux) |
3601 ifneq (,$(findstring lib64,$(libdir))) |
3606 ifneq (,$(findstring lib64,$(libdir))) |
3602 DEFINES += -DHAVE_USR_LIB64_DIR |
3607 DEFINES += -DHAVE_USR_LIB64_DIR |
3603 endif |
3608 endif |