system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Jacek Caban 2011-04-04 19:32:35 +02:00 committed by Alexandre Julliard
parent 7871a9f858
commit bf163d79b8
2 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dlls/mshtml/nsembed.c
View file

@ -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,

11
dlls/mshtml/nsiface.idl
View file

@ -153,6 +153,7 @@ typedef nsISupports nsIPluginStreamListener;
typedef nsISupports nsIContentSink;
typedef nsISupports nsIParserFilter;
typedef nsISupports nsIDTD;
typedef nsISupports nsIObserver;
[
object,
@ -178,16 +179,6 @@ interface nsIFactory : nsISupports
nsresult LockFactory(PRBool lock);
}
[
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),