From 5c06d159bb88f0c4220b9c49176e2acf1588c171 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Fri, 6 Nov 2009 14:33:17 -0800
Subject: [PATCH] Bug 526651: Interfaces changed between the 1.9.2 branch and
 trunk with no IID rev. r=joe, r=mak77, r=myk

---
 modules/libpr0n/public/imgIRequest.idl                        | 2 +-
 .../components/contentprefs/public/nsIContentPrefService.idl  | 4 ++--
 toolkit/components/places/public/nsINavBookmarksService.idl   | 4 ++--
 toolkit/components/places/public/nsINavHistoryService.idl     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/libpr0n/public/imgIRequest.idl b/modules/libpr0n/public/imgIRequest.idl
index 6155aa3a960..0834035a71a 100644
--- a/modules/libpr0n/public/imgIRequest.idl
+++ b/modules/libpr0n/public/imgIRequest.idl
@@ -52,7 +52,7 @@ interface nsIPrincipal;
  * @version 0.1
  * @see imagelib2
  */
-[scriptable, uuid(a297d3fa-5e0c-4e59-9f30-a01c9d4f3f8b)]
+[scriptable, uuid(c0c9f606-19d6-4ed1-8486-6cae2fe0a6a4)]
 interface imgIRequest : nsIRequest
 {
   /**
diff --git a/toolkit/components/contentprefs/public/nsIContentPrefService.idl b/toolkit/components/contentprefs/public/nsIContentPrefService.idl
index 7ec369fc553..e9b766aea0c 100644
--- a/toolkit/components/contentprefs/public/nsIContentPrefService.idl
+++ b/toolkit/components/contentprefs/public/nsIContentPrefService.idl
@@ -42,7 +42,7 @@ interface nsIPropertyBag2;
 interface nsIContentURIGrouper;
 interface mozIStorageConnection;
 
-[scriptable, uuid(0d896125-a97e-4617-84e1-004a5de27e76)]
+[scriptable, uuid(746c7a02-f6c1-4869-b434-7c8b86e60e61)]
 interface nsIContentPrefObserver : nsISupports
 {
   /**
@@ -65,7 +65,7 @@ interface nsIContentPrefObserver : nsISupports
   void onContentPrefRemoved(in AString aGroup, in AString aName);
 };
 
-[scriptable, uuid(ea7d29eb-7095-476e-b5d9-13263f3ae243)]
+[scriptable, uuid(b3976fa1-189f-4fcb-9c3b-49d1f6d8073d)]
 interface nsIContentPrefService : nsISupports
 {
   /**
diff --git a/toolkit/components/places/public/nsINavBookmarksService.idl b/toolkit/components/places/public/nsINavBookmarksService.idl
index 1fb9675a40a..81168c40779 100644
--- a/toolkit/components/places/public/nsINavBookmarksService.idl
+++ b/toolkit/components/places/public/nsINavBookmarksService.idl
@@ -50,7 +50,7 @@ interface nsINavHistoryBatchCallback;
  * Observer for bookmark changes.
  */
 
-[scriptable, uuid(4270ae71-d92c-4a6f-81c7-0d7f76f01c06)]
+[scriptable, uuid(1f7e9032-b2c0-4561-b35b-94ba3f8344e2)]
 interface nsINavBookmarkObserver : nsISupports
 {
   /**
@@ -194,7 +194,7 @@ interface nsINavBookmarkObserver : nsISupports
  * 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)]
 interface nsINavBookmarksService : nsISupports
 {
   /**
diff --git a/toolkit/components/places/public/nsINavHistoryService.idl b/toolkit/components/places/public/nsINavHistoryService.idl
index 76f2603436e..6e7af371118 100644
--- a/toolkit/components/places/public/nsINavHistoryService.idl
+++ b/toolkit/components/places/public/nsINavHistoryService.idl
@@ -59,7 +59,7 @@ interface nsINavHistoryResult;
 interface nsINavHistoryBatchCallback;
 interface nsITreeColumn;
 
-[scriptable, uuid(464ae28f-3a9c-4483-afb2-bb0fb0ddb893)]
+[scriptable, uuid(081452e5-be5c-4038-a5ea-f1f34cb6fd81)]
 interface nsINavHistoryResultNode : nsISupports
 {
   /**