[mq]: gtk3 draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Wed, 23 Jul 2014 18:23:27 +0900
changeset 25005 e6300e7d2b4fff28dad56b30a22fc3375c63505e
parent 25004 acb745a4d796d46cf9dcb64db402257b6570305f
child 25006 e245b534c82cd20ed64645e235240f5f292ad432
push id1592
push userm_kato@ga2.so-net.ne.jp
push dateWed, 23 Jul 2014 11:27:12 +0000
treeherdertry-comm-central@e245b534c82c [default view] [failures only]
[mq]: gtk3
mail/app/Makefile.in
mail/app/profile/all-thunderbird.js
mail/base/Makefile.in
mail/base/moz.build
mail/branding/aurora/Makefile.in
mail/branding/nightly/Makefile.in
mail/components/addrbook/content/addressbook.xul
mail/components/build/nsMailComps.cpp
mail/components/moz.build
mail/components/preferences/Makefile.in
mail/components/preferences/applications.js
mail/components/preferences/moz.build
mail/components/shell/Makefile.in
mail/components/shell/moz.build
mail/components/shell/public/moz.build
mail/installer/Makefile.in
mail/installer/moz.build
mail/installer/package-manifest.in
mail/installer/removed-files.in
mail/themes/moz.build
mailnews/base/src/moz.build
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -168,17 +168,17 @@ libs:: $(addprefix $(DIST)/branding/,$(B
 
 install:: $(addprefix icons/$(MOZ_WIDGET_TOOLKIT)/,$(DESKTOP_ICON_FILES))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
 
 install:: $(addprefix $(DIST)/branding,$(BRANDED_ICON_FILES))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
 endif
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ifdef MOZ_WIDGET_GTK
 libs::
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default
 endif
 
 libs:: $(srcdir)/profile/prefs.js
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -27,17 +27,17 @@ pref("mail.rights.override", true);
 #endif
 #ifndef MOZILLA_OFFICIAL
 pref("mail.rights.override", true);
 #endif
 
 // gtk2 (*nix) lacks transparent/translucent drag support (bug 376238), so we
 // want to disable it so people can see where they are dragging things.
 // (Stock gtk drag icons will be used instead.)
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
 pref("nglayout.enable_drag_images", false);
 #endif
 
 // The minimum delay in seconds for the timer to fire.
 // default=2 minutes
 pref("app.update.timerMinimumDelay", 120);
 
 // App-specific update preferences
--- a/mail/base/Makefile.in
+++ b/mail/base/Makefile.in
@@ -15,20 +15,16 @@ PRE_RELEASE_SUFFIX := $(shell $(PYTHON) 
 
 DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
            -DPRE_RELEASE_SUFFIX=""
 
 ifdef MOZILLA_OFFICIAL
 DEFINES += -DOFFICIAL_BUILD=1
 endif
 
-ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
-DEFINES += -DHAVE_SHELL_SERVICE=1
-endif
-
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 ifneq (,$(filter windows cocoa, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DCAN_DRAW_IN_TITLEBAR=1
 endif
 
--- a/mail/base/moz.build
+++ b/mail/base/moz.build
@@ -3,8 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['modules']
 
 TEST_DIRS += ['test']
 
 JAR_MANIFESTS += ['jar.mn']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
+    DEFINES['HAVE_SHELL_SERVICE'] = True
--- a/mail/branding/aurora/Makefile.in
+++ b/mail/branding/aurora/Makefile.in
@@ -25,17 +25,17 @@ ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/wizWatermark.bmp
 endif
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	cp $(srcdir)/background.png    $(DIST)/branding/background.png
 	cp $(srcdir)/dsstore           $(DIST)/branding/dsstore
 	cp $(srcdir)/disk.icns         $(DIST)/branding/disk.icns
 	cp $(srcdir)/thunderbird.icns  $(DIST)/branding/thunderbird.icns
 endif
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ifdef MOZ_WIDGET_GTK
 	cp $(srcdir)/mailicon16.png  $(DIST)/branding/default16.png
 	cp $(srcdir)/mailicon22.png  $(DIST)/branding/default22.png
 	cp $(srcdir)/mailicon24.png  $(DIST)/branding/default24.png
 	cp $(srcdir)/mailicon32.png  $(DIST)/branding/default32.png
 	cp $(srcdir)/mailicon48.png  $(DIST)/branding/default48.png
 	cp $(srcdir)/mailicon256.png $(DIST)/branding/default256.png
 endif
 
--- a/mail/branding/nightly/Makefile.in
+++ b/mail/branding/nightly/Makefile.in
@@ -25,17 +25,17 @@ ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/wizWatermark.bmp
 endif
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	cp $(srcdir)/background.png    $(DIST)/branding/background.png
 	cp $(srcdir)/dsstore           $(DIST)/branding/dsstore
 	cp $(srcdir)/disk.icns         $(DIST)/branding/disk.icns
 	cp $(srcdir)/thunderbird.icns  $(DIST)/branding/thunderbird.icns
 endif
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ifdef MOZ_WIDGET_GTK
 	cp $(srcdir)/mailicon16.png  $(DIST)/branding/default16.png
 	cp $(srcdir)/mailicon22.png  $(DIST)/branding/default22.png
 	cp $(srcdir)/mailicon24.png  $(DIST)/branding/default24.png
 	cp $(srcdir)/mailicon32.png  $(DIST)/branding/default32.png
 	cp $(srcdir)/mailicon48.png  $(DIST)/branding/default48.png
 	cp $(srcdir)/mailicon256.png $(DIST)/branding/default256.png
 endif
 
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -142,17 +142,17 @@
 
 #ifdef XP_MACOSX
   <key id="key_delete" keycode="VK_BACK" command="cmd_delete"/>
   <key id="key_delete2" keycode="VK_DELETE" command="cmd_delete"/>
 #else
   <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
 #endif
   <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
   <key id="key_searchAddresses" key="&searchAddressesCmd.key;" oncommand="onAdvancedAbSearch();" modifiers="shift"/>
 #else
   <key id="key_searchAddresses" key="&searchAddressesCmd.key;" oncommand="onAdvancedAbSearch();" modifiers="accel, shift"/>
 #endif
   <key id="key_properties" command="cmd_properties" key="&propertiesCmd.key;" modifiers="accel"/>
 
   <!-- Tab/F6 Keys -->
   <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
--- a/mail/components/build/nsMailComps.cpp
+++ b/mail/components/build/nsMailComps.cpp
@@ -26,17 +26,17 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsOutlook
 #include "nsMailWinIntegration.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowsShellService, Init)
 #endif
 
 #if defined(XP_WIN32) || defined(XP_MACOSX)
 #include "nsEudoraProfileMigrator.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsEudoraProfileMigrator)
 #endif
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
 #include "nsMailGNOMEIntegration.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMailGNOMEIntegration, Init)
 #endif
 #ifdef XP_MACOSX
 #include "nsMailMacIntegration.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMailMacIntegration)
 #endif
 
@@ -55,17 +55,17 @@ NS_DEFINE_NAMED_CID(NS_OUTLOOKPROFILEMIG
 NS_DEFINE_NAMED_CID(NS_MAILWININTEGRATION_CID);
 NS_DEFINE_NAMED_CID(NS_MAILWINSEARCHHELPER_CID);
 #endif // !XP_WIN32
 
 #if defined (XP_WIN32) || defined (XP_MACOSX)
 NS_DEFINE_NAMED_CID(NS_EUDORAPROFILEMIGRATOR_CID);
 #endif
 
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
 NS_DEFINE_NAMED_CID(NS_MAILGNOMEINTEGRATION_CID);
 #endif
 
 #ifdef XP_MACOSX
 NS_DEFINE_NAMED_CID(NS_MAILMACINTEGRATION_CID);
 #endif
 
 const mozilla::Module::CIDEntry kMailCIDs[] = {
@@ -76,17 +76,17 @@ const mozilla::Module::CIDEntry kMailCID
   { &kNS_OEXPRESSPROFILEMIGRATOR_CID, false, NULL, nsOEProfileMigratorConstructor },
   { &kNS_OUTLOOKPROFILEMIGRATOR_CID, false, NULL, nsOutlookProfileMigratorConstructor },
   { &kNS_MAILWININTEGRATION_CID, false, NULL, nsWindowsShellServiceConstructor },
   { &kNS_MAILWINSEARCHHELPER_CID, false, NULL, nsMailWinSearchHelperConstructor },
 #endif // !XP_WIN32
 #if defined (XP_WIN32) || defined (XP_MACOSX)
   { &kNS_EUDORAPROFILEMIGRATOR_CID, false, NULL, nsEudoraProfileMigratorConstructor },
 #endif
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
   { &kNS_MAILGNOMEINTEGRATION_CID, false, NULL, nsMailGNOMEIntegrationConstructor },
 #endif
 #ifdef XP_MACOSX
   { &kNS_MAILMACINTEGRATION_CID, false, NULL, nsMailMacIntegrationConstructor },
 #endif
   { NULL }
 };
 
@@ -98,17 +98,17 @@ const mozilla::Module::ContractIDEntry k
   { NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "oexpress", &kNS_OEXPRESSPROFILEMIGRATOR_CID },
   { NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "outlook", &kNS_OUTLOOKPROFILEMIGRATOR_CID },
   { "@mozilla.org/mail/shell-service;1", &kNS_MAILWININTEGRATION_CID },
   { "@mozilla.org/mail/windows-search-helper;1", &kNS_MAILWINSEARCHHELPER_CID },
 #endif // !XP_WIN32
 #if defined (XP_WIN32) || defined (XP_MACOSX)
   { NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "eudora", &kNS_EUDORAPROFILEMIGRATOR_CID },
 #endif
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
   { "@mozilla.org/mail/shell-service;1", &kNS_MAILGNOMEINTEGRATION_CID },
 #endif
 #ifdef XP_MACOSX
   { "@mozilla.org/mail/shell-service;1", &kNS_MAILMACINTEGRATION_CID },
 #endif
   { NULL }
 };
 
--- a/mail/components/moz.build
+++ b/mail/components/moz.build
@@ -15,17 +15,17 @@ DIRS += [
     'activity',
     'search',
     'about-support',
     'wintaskbar',
     'newmailaccount',
     'im',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'cocoa', 'qt'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa', 'qt'):
     DIRS += ['shell']
 
 if CONFIG['MOZ_SAFE_BROWSING']:
     DIRS += ['phishing']
 
 TEST_DIRS += ['test']
 
 DIRS += ['build']
--- a/mail/components/preferences/Makefile.in
+++ b/mail/components/preferences/Makefile.in
@@ -9,15 +9,11 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME)
 
-ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
-DEFINES += -DHAVE_SHELL_SERVICE=1
-endif
-
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
--- a/mail/components/preferences/applications.js
+++ b/mail/components/preferences/applications.js
@@ -17,17 +17,17 @@ const PREF_HIDE_PLUGINS_WITHOUT_EXTENSIO
 
 // The nsHandlerInfoAction enumeration values in nsIHandlerInfo identify
 // the actions the application can take with content of various types.
 // But since nsIHandlerInfo doesn't support plugins, there's no value
 // identifying the "use plugin" action, so we use this constant instead.
 const kActionUsePlugin = 5;
 
 /*
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
 */
 const ICON_URL_APP      = "moz-icon://dummy.exe?size=16";
 /*
 #else
 */
 const ICON_URL_APP      = "chrome://messenger/skin/preferences/application.png";
 /*
 #endif
--- a/mail/components/preferences/moz.build
+++ b/mail/components/preferences/moz.build
@@ -1,6 +1,9 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 JAR_MANIFESTS += ['jar.mn']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
+    DEFINES['HAVE_SHELL_SERVICE'] = True
--- a/mail/components/shell/Makefile.in
+++ b/mail/components/shell/Makefile.in
@@ -4,13 +4,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\"
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS)
--- a/mail/components/shell/moz.build
+++ b/mail/components/shell/moz.build
@@ -7,21 +7,22 @@ DIRS += ['public']
 
 SOURCES += [
     'DirectoryProvider.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += ['nsMailWinIntegration.cpp']
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
+if CONFIG['MOZ_WIDGET_GTK']:
     SOURCES += ['nsMailGNOMEIntegration.cpp']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += ['nsMailMacIntegration.cpp']
 
 EXTRA_COMPONENTS += [
     'nsSetDefaultMail.js',
     'shell.manifest',
 ]
 
 FINAL_LIBRARY = 'mailcomps'
 
+DEFINES['MOZ_APP_NAME'] = '"%s"' % CONFIG['MOZ_APP_NAME']
--- a/mail/components/shell/public/moz.build
+++ b/mail/components/shell/public/moz.build
@@ -1,12 +1,16 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIShellService.idl',
-    'nsIWindowsShellService.idl',
 ]
 
+if CONFIG['OS_ARCH'] == 'WINNT':
+    XPIDL_SOURCES += [
+        'nsIWindowsShellService.idl',
+    ]
+
 XPIDL_MODULE = 'shellservice'
 
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -35,20 +35,16 @@ DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NA
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
 endif
 
 ifdef MOZ_ENABLE_GNOME_COMPONENT
 DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
 endif
 
-ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
-DEFINES += -DMOZ_GTK2=1
-endif
-
 ifdef _MSC_VER
 DEFINES += -D_MSC_VER=$(_MSC_VER)
 endif
 
 DEFINES += -DJAREXT=
 
 ifdef MOZ_ANGLE_RENDERER
 DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
--- a/mail/installer/moz.build
+++ b/mail/installer/moz.build
@@ -1,4 +1,7 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+if CONFIG['MOZ_WIDGET_GTK']:
+    DEFINES['MOZ_GTK'] = True
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -542,17 +542,17 @@
 #endif
 @BINPATH@/components/toolkit_osfile.xpt
 @BINPATH@/components/toolkitplaces.manifest
 @BINPATH@/components/toolkitsearch.manifest
 #ifdef UNIX_BUT_NOT_MAC
 @BINPATH@/components/toolkitremote.xpt
 @BINPATH@/mozilla-xremote-client
 #endif
-#ifdef MOZ_GTK2
+#ifdef MOZ_GTK
 @BINPATH@/components/filepicker.xpt
 @BINPATH@/components/nsFilePicker.js
 @BINPATH@/components/nsFilePicker.manifest
 #endif
 #ifdef MOZ_ENABLE_DBUS
 @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
 #endif
 #ifdef MOZ_ENABLE_PROFILER_SPS
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -17,17 +17,17 @@ chrome/en-US-mail.jar
 #endif
 chrome/installed-chrome.txt
 chrome/mail.jar
 chrome/offline.jar
 chrome/offline.manifest
 chrome/overlayinfo/
 chrome/qute.jar
 chrome/US.jar
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
   chrome/icons/default/abcardWindow.xpm
   chrome/icons/default/abcardWindow16.xpm
   chrome/icons/default/addressbookWindow.xpm
   chrome/icons/default/addressbookWindow16.xpm
   chrome/icons/default/default.xpm
   chrome/icons/default/messengerWindow.xpm
   chrome/icons/default/messengerWindow16.xpm
   chrome/icons/default/msgcomposeWindow.xpm
@@ -218,17 +218,17 @@ hyphenation/hyph_nn.dic
 hyphenation/hyph_pt.dic
 hyphenation/hyph_ru.dic
 hyphenation/hyph_sh.dic
 hyphenation/hyph_sl.dic
 hyphenation/hyph_sv.dic
 hyphenation/hyph_tr.dic
 hyphenation/hyph_uk.dic
 
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
   icons/mozicon128.png
   icons/mozicon16.xpm
   icons/mozicon50.xpm
 #endif
 init.d/README
 #ifdef XP_MACOSX
   isp/dotmac.rdf
 #endif
--- a/mail/themes/moz.build
+++ b/mail/themes/moz.build
@@ -1,14 +1,14 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'qt'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
     DIRS += ['linux']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DIRS += ['osx']
 else:
     DIRS += ['windows']
 
 classic_extension_dir = '{972ce4c6-7e08-4474-a285-3208198ce6fd}'
 
--- a/mailnews/base/src/moz.build
+++ b/mailnews/base/src/moz.build
@@ -53,18 +53,17 @@ SOURCES += [
     'nsSubscribeDataSource.cpp',
 ]
 
 if CONFIG['NS_PRINTING']:
     SOURCES += ['nsMsgPrintEngine.cpp']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += ['nsMessengerWinIntegration.cpp']
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
+elif CONFIG['MOZ_WIDGET_GTK']:
     SOURCES += ['nsMessengerUnixIntegration.cpp']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += ['nsMessengerOSXIntegration.mm']
 
 EXTRA_COMPONENTS += [
     'folderLookupService.js',
     'msgAsyncPrompter.js',
     'msgBase.manifest',