--- a/Tools__ChangeSetBrowser2.st	Thu Nov 15 10:00:18 2012 +0000
+++ b/Tools__ChangeSetBrowser2.st	Fri Nov 16 10:56:44 2012 +0000
@@ -3249,30 +3249,46 @@
 "/        [(Smalltalk at: aChange superClassName asSymbol)
 "/            ifNil:[^self error: 'Nil superclass']].
 
+    | nsQueries packageQueries hasMC apply |
+
     aChange removed ifTrue:[ ^ self ].
 
+
+    nsQueries := Class nameSpaceQuerySignal.
+    packageQueries := Class packageQuerySignal.
+    hasMC := ConfigurableFeatures includesFeature:#MonticelloSupport.
+    hasMC ifTrue:[
+        nsQueries := nsQueries , MCStXNamespaceQuery.
+        packageQueries := packageQueries , MCStXPackageQuery.
+    ].
+    apply := [
+        updateChangeFileHolder value ifTrue:[
+            aChange apply
+        ] ifFalse:[
+            Class withoutUpdatingChangesDo:[
+                aChange apply
+            ]
+        ].
+    ].
+
     self withWaitCursorDo:[
-	(MCStXNamespaceQuery , Class nameSpaceQuerySignal)
-	    answer:(NameSpace name:(targetNamespace ? 'Smalltalk'))
-	    do: [
-		(MCStXPackageQuery , Class packageQuerySignal)
-		    answer: self targetPackage
-		    do: [
-			MCInteractiveLoadingQuery answer: true do:[
-			    updateChangeFileHolder value ifTrue:[
-				aChange apply
-			    ] ifFalse:[
-				Class withoutUpdatingChangesDo:[
-				    aChange apply
-				]
-			    ].
-			]
-		    ].
-	    ].
+        nsQueries 
+            answer:(NameSpace name:(targetNamespace ? 'Smalltalk'))
+            do: [
+                packageQueries 
+                    answer: self targetPackage
+                    do: [
+                        hasMC ifTrue:[
+                            MCInteractiveLoadingQuery answer: true do: apply
+                        ] ifFalse:[
+                            apply value.
+                        ]
+                    ].
+            ].
     ].
 
     "Modified: / 07-09-2011 / 22:24:57 / cg"
-    "Modified: / 30-03-2012 / 13:20:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 16-11-2012 / 10:58:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 changeMenuApplyChanges: changesToApply
@@ -3762,7 +3778,7 @@
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version
-    ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.42 2012/09/10 12:42:37 cg Exp §'
+    ^ '$Id: Tools__ChangeSetBrowser2.st 8071 2012-11-16 10:56:44Z vranyj1 $'
 !
 
 version_CVS
@@ -3770,5 +3786,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetBrowser2.st 8054 2012-09-13 09:15:20Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetBrowser2.st 8071 2012-11-16 10:56:44Z vranyj1 $'
 ! !