526651 - Interfaces changed between the 1.9.2 branch and trunk with no IID rev

Status: RESOLVED FIXED

(Core :: General, defect)

Description

[Dave Townsend [:mossop]]

Going to post a bunch of patchs to track the issues found on trunk by bug 477166

Comment 1

[Dave Townsend [:mossop]]

Attachment: rev from bug 498130 and bug 524972

Comment 2

[Dave Townsend [:mossop]]

Attachment: rev from bug 498130 and bug 524972

Comment 3

[Dave Townsend [:mossop]]

Attachment: rev from bug 435296

Comment 4

[Dave Townsend [:mossop]]

Attachment: rev from bug 506799

Bug 506799 revved the wrong iid, this undoes that and revs the right one.

Comment 5

[Myk Melez [:myk] [@mykmelez]]

Comment on attachment 410397 [details] [diff] [review]
rev from bug 506799

D'oh! Indeed.

Comment 6

[Marco Bonardo [:mak]]

Comment on attachment 410395 [details] [diff] [review]
rev from bug 498130 and bug 524972

>diff --git a/toolkit/components/places/public/nsINavBookmarksService.idl b/toolkit/components/places/public/nsINavBookmarksService.idl

> /**
>  * The BookmarksService interface provides methods for managing bookmarked
>  * history items.  Bookmarks consist of a set of user-customizable
>  * folders.  A URI in history can be contained in one or more such folders.
>  */
> 
>-[scriptable, uuid(3b6ff5c5-0ab4-4aab-b1be-d569763a6ce0)]
>+[scriptable, uuid(573f99bd-988c-4253-836f-4ce009d33ac6)]

this change should ONLY land on trunk since bug 524972 is not on 1.9.2 branch and it did not update the uuid.
or better, Neil wrongly revved the observer uuid instead of the bookmarksService uuid, and i misread it
so, please after updating this uuid also revert this change from bug 524972

-[scriptable, uuid(1f7e9032-b2c0-4561-b35b-94ba3f8344e2)]
+[scriptable, uuid(4270ae71-d92c-4a6f-81c7-0d7f76f01c06)]
 interface nsINavBookmarkObserver : nsISupports

since this is an unneeded uuid change

>diff --git a/toolkit/components/places/public/nsINavHistoryService.idl b/toolkit/components/places/public/nsINavHistoryService.idl
>-[scriptable, uuid(464ae28f-3a9c-4483-afb2-bb0fb0ddb893)]
>+[scriptable, uuid(081452e5-be5c-4038-a5ea-f1f34cb6fd81)]
> interface nsINavHistoryResultNode : nsISupports
> {
>   /**
>    * Indentifies the parent result node in the result set. This is null for
>    * top level nodes.
>    */
>   readonly attribute nsINavHistoryContainerResultNode parent;
> 

this should only land on 1.9.2 instead.

thanks!

Comment 7

[Dave Townsend [:mossop]]

(In reply to comment #6)
> >diff --git a/toolkit/components/places/public/nsINavHistoryService.idl b/toolkit/components/places/public/nsINavHistoryService.idl
> >-[scriptable, uuid(464ae28f-3a9c-4483-afb2-bb0fb0ddb893)]
> >+[scriptable, uuid(081452e5-be5c-4038-a5ea-f1f34cb6fd81)]
> > interface nsINavHistoryResultNode : nsISupports
> > {
> >   /**
> >    * Indentifies the parent result node in the result set. This is null for
> >    * top level nodes.
> >    */
> >   readonly attribute nsINavHistoryContainerResultNode parent;
> > 
> 
> this should only land on 1.9.2 instead.

These patches are only for trunk. Why do you think this rev should only land on 1.9.2?

Comment 8

[Marco Bonardo [:mak]]

because trunk got the correct uuid rev afaict, 1.9.2 has a slightly different interface though but Mano when pushing to 1.9.2 forgot to change it.
So, the final result won't change, but chronologically trunk was correct, the push to 1.9.2 was not. The final result is the same, so feel freee to proceed as you prefer.

Comment 9

[Dave Townsend [:mossop]]

Pushed: http://hg.mozilla.org/mozilla-central/rev/f6c80d9da994