Jacek Caban : mshtml: Get rid of no longer needed app-startup observer initialization.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bf163d79b811041490472c0736e71e6762db9c71
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bf163d79b811041490472c0736...

Author: Jacek Caban 
Date:   Mon Apr  4 19:32:35 2011 +0200

mshtml: Get rid of no longer needed app-startup observer initialization.

---

dlls/mshtml/nsembed.c   |   18 +-----------------
 dlls/mshtml/nsiface.idl |   11 +----------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index c2332e0..7b7a84f 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -46,8 +46,6 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko);
 #define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1"
 #define NS_PREFERENCES_CONTRACTID "@mozilla.org/preferences;1"

-#define APPSTARTUP_TOPIC "app-startup"
-
 #define PR_UINT32_MAX 0xffffffff

#define NS_STRING_CONTAINER_INIT_DEPEND  0x0002
@@ -559,12 +557,11 @@ static void set_preferences(void)

static BOOL init_xpcom(const PRUnichar *gre_path)
 {
-    nsresult nsres;
-    nsIObserver *pStartNotif;
     nsIComponentRegistrar *registrar = NULL;
     nsAString path;
     nsIFile *gre_dir;
     WCHAR *ptr;
+    nsresult nsres;

nsAString_InitDepend(&path, gre_path);
     nsres = NS_NewLocalFile(&path, FALSE, &gre_dir);
@@ -600,19 +597,6 @@ static BOOL init_xpcom(const PRUnichar *gre_path)
         ERR("NS_GetComponentRegistrar failed: %08x\n", nsres);

init_mutation(pCompMgr);
-
-    nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_APPSTARTUPNOTIFIER_CONTRACTID,
-            NULL, &IID_nsIObserver, (void**)&pStartNotif);
-    if(NS_SUCCEEDED(nsres)) {
-        nsres = nsIObserver_Observe(pStartNotif, NULL, APPSTARTUP_TOPIC, NULL);
-        if(NS_FAILED(nsres))
-            ERR("Observe failed: %08x\n", nsres);
-
-        nsIObserver_Release(pStartNotif);
-    }else {
-        ERR("could not get appstartup-notifier: %08x\n", nsres);
-    }
-
     set_preferences();

nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_MEMORY_CONTRACTID,
diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index b6367b4..9d682f0 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -153,6 +153,7 @@ typedef nsISupports nsIPluginStreamListener;
 typedef nsISupports nsIContentSink;
 typedef nsISupports nsIParserFilter;
 typedef nsISupports nsIDTD;
+typedef nsISupports nsIObserver;

[
     object,
@@ -180,16 +181,6 @@ interface nsIFactory : nsISupports

[
     object,
-    uuid(db242e01-e4d9-11d2-9dde-000064657374),
-    local
-]
-interface nsIObserver : nsISupports
-{
-    nsresult Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData);
-}
-
-[
-    object,
     uuid(a88e5a60-205a-4bb1-94e1-2628daf51eae),
     local
 ]