586711 - Incubator embedding requires switching to XRE_InitEmbedding2

Status: RESOLVED FIXED

(Core Graveyard :: Embedding: APIs, defect)

Description

[Tatiana Meshkova (:tatiana)]

User-Agent:       Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.8) Gecko/20100723 Ubuntu/10.04 (lucid) Firefox/3.6.8
Build Identifier: 

due to bug #568691 xulrunner 2 changes incubator embedding needs to use XRE_InitEmbedding2 API

Reproducible: Always

Comment 1

[Tatiana Meshkova (:tatiana)]

Attachment: switching to XRE_InitEmbedding2

Comment 2

[Benjamin Smedberg]

Comment on attachment 465300 [details] [diff] [review]
switching to XRE_InitEmbedding2

I am not the maintainer of the new embedding API.

Comment 3

[Mark Finkle (:mfinkle) (use needinfo?)]

Comment on attachment 465300 [details] [diff] [review]
switching to XRE_InitEmbedding2


>     // init embedding
>-    rv = XRE_InitEmbedding(xuldir, appdir,
>-                           const_cast<MozEmbedDirectoryProvider*>(&kDirectoryProvider),
>-                           aComps, aNumComps);
>+    rv = XRE_InitEmbedding2(xuldir, appdir,
>+                           const_cast<MozEmbedDirectoryProvider*>(&kDirectoryProvider));
>     if (NS_FAILED(rv)) {
>         cerr << "XRE_InitEmbedding failed." << endl;

Change the cerr string?

>diff -r 1cc6a4df693b -r 03cdcef7e2ea common/EmbeddingSetup.h

>  * @param aProfilePath Optional argument to set the path where
>  *  profile data is stored. The directory will be created if it
>  *  doesn't exist.
>  * @param aComps Optional argument to register static
>  *  components at startup.
>  * @param aNumComps Optional argument to set number of
>  *  static components.
>  */
>-nsresult InitEmbedding(const char* aProfilePath = 0, 
>-                       const nsStaticModuleInfo* aComps = 0, 
>-                       int aNumComps = 0);

Remove "aComps" and "aNumComps" from the comments

r+ but post a new patch with the nits fixed

Comment 4

[Tatiana Meshkova (:tatiana)]

Attachment: new patch with the nits fixed

Comment 5

[Oleg Romashin (:romaxa)]

Comment on attachment 465300 [details] [diff] [review]
switching to XRE_InitEmbedding2

simple switch, looks fine

Comment 6

[Oleg Romashin (:romaxa)]

http://hg.mozilla.org/incubator/embedding/rev/07985cf307db