Bug 1773772 part 13 - Fix initialisation of nsGNOMEShellService, nsWindowsShellService and nsMailWinSearchHelper. r=nicolai default tip
authorGeoff Lankow <geoff@darktrojan.net>
Mon, 04 Jul 2022 12:40:52 +0200
changeset 36189 40b247165baa05a2bb80f4624d8f9c9ef4878bc3
parent 36188 927fa9d8e7e5ebfe1f3e96e7f2a7ab77a30deffa
push id20068
push usernicolai@thunderbird.net
push dateMon, 04 Jul 2022 10:45:08 +0000
treeherdercomm-central@40b247165baa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnicolai
bugs1773772
Bug 1773772 part 13 - Fix initialisation of nsGNOMEShellService, nsWindowsShellService and nsMailWinSearchHelper. r=nicolai Differential Revision: https://phabricator.services.mozilla.com/D150928
mail/components/search/components.conf
mail/components/shell/components.conf
--- a/mail/components/search/components.conf
+++ b/mail/components/search/components.conf
@@ -5,11 +5,12 @@
 Classes = []
 
 if buildconfig.substs["OS_ARCH"] == "WINNT":
     Classes += [
         {
             "cid": "{5dd31c99-08c7-4a3b-aeb3-d2e60665a31a}",
             "contract_ids": ["@mozilla.org/mail/windows-search-helper;1"],
             "type": "nsMailWinSearchHelper",
+            "init_method": "Init",
             "headers": ["/comm/mail/components/search/nsMailWinSearchHelper.h"],
         },
     ]
--- a/mail/components/shell/components.conf
+++ b/mail/components/shell/components.conf
@@ -5,26 +5,28 @@
 Classes = []
 
 if buildconfig.substs["OS_ARCH"] == "WINNT":
     Classes += [
         {
             "cid": "{02ebbe84-c179-4598-af18-1bf2c4bc1df9}",
             "contract_ids": ["@mozilla.org/mail/shell-service;1"],
             "type": "nsWindowsShellService",
+            "init_method": "Init",
             "headers": ["/comm/mail/components/shell/nsWindowsShellService.h"],
         },
     ]
 
 if buildconfig.substs["MOZ_WIDGET_TOOLKIT"] == "gtk":
     Classes += [
         {
             "cid": "{bddef0f4-5e2d-4846-bdec-86d0781d8ded}",
             "contract_ids": ["@mozilla.org/mail/shell-service;1"],
             "type": "nsGNOMEShellService",
+            "init_method": "Init",
             "headers": ["/comm/mail/components/shell/nsGNOMEShellService.h"],
         },
     ]
 
 if buildconfig.substs["OS_ARCH"] == "Darwin":
     Classes += [
         {
             "cid": "{85a27035-b970-4079-b9d2-e21f69e6b21f}",