--- a/Tools__NewSystemBrowser.st	Mon Jan 23 15:41:54 2012 +0100
+++ b/Tools__NewSystemBrowser.st	Tue Jan 24 00:15:39 2012 +0100
@@ -16000,6 +16000,7 @@
     "Modified: / 29-09-2006 / 16:11:08 / cg"
 ! !
 
+
 !NewSystemBrowser class methodsFor:'menu specs-popup'!
 
 categoryPopUpMenu
@@ -17746,6 +17747,7 @@
     "Created: / 24.2.2000 / 23:28:06 / cg"
 ! !
 
+
 !NewSystemBrowser methodsFor:'aspects-organization'!
 
 categoryMenuVisible
@@ -21170,6 +21172,7 @@
     ^ UserPreferences current useSearchBarInBrowser or:[self codeView searchBarActionBlock notNil]
 ! !
 
+
 !NewSystemBrowser methodsFor:'change & update'!
 
 categorySelectionChanged
@@ -34924,6 +34927,7 @@
     ^ brwsr
 ! !
 
+
 !NewSystemBrowser methodsFor:'menu actions-namespace'!
 
 nameSpaceMenuCheckOut
@@ -43426,6 +43430,7 @@
     "Modified: / 25-06-2010 / 10:08:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !NewSystemBrowser methodsFor:'menu actions-variables'!
 
 browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll
@@ -48134,7 +48139,7 @@
     "Show a warning in package info bar if configured source code manager 
      does not match the source code manager for source access"
 
-    | cnfManager srcManager color showInfoButton |
+    | cls cnfManager srcManager color showInfoButton |
 
     navigationState packageInfoButton isNil ifTrue:[
         "JV@2011-10-03: When a browser is embedded in the inspector,
@@ -48143,14 +48148,17 @@
         ^self.
     ].
 
+
     color := Label defaultBackgroundColor.
     showInfoButton := false.
 
     (aClass notNil and:[aClass isLoaded]) ifTrue:[
+         cls := aClass.
+        [ cls isPrivate ] whileTrue:[cls := cls owningClass].
         "For libbasic without #sourceCodeManagerFromBinaryRevision..."
-        (aClass respondsTo: #sourceCodeManagerFromBinaryRevision) ifTrue:[
-            cnfManager := aClass sourceCodeManager.
-            srcManager := aClass sourceCodeManagerFromBinaryRevision.
+        (cls respondsTo: #sourceCodeManagerFromBinaryRevision) ifTrue:[
+            cnfManager := cls sourceCodeManager.
+            srcManager := cls sourceCodeManagerFromBinaryRevision.
 
             cnfManager ~~ srcManager ifTrue:[
                          "Color yellow lighter"
@@ -48158,7 +48166,7 @@
                 showInfoButton := true.
                 navigationState packageInfoButton action:
                     [self 
-                        informUserAboutPackage: aClass package 
+                        informUserAboutPackage: cls package 
                         configuredManager: cnfManager 
                         sourceManager: srcManager
                     ]
@@ -50448,6 +50456,7 @@
     ^ navigationState projectListApplication
 ! !
 
+
 !NewSystemBrowser methodsFor:'private-history'!
 
 lastSearchPatterns
@@ -53588,7 +53597,19 @@
      code manager does not match the source code manager
      for source access"
 
-    | dialog |
+    | dialog cnfManagerName srcManagerName |
+
+    cnfManager notNil ifTrue:[
+        cnfManagerName := cnfManager managerTypeName
+    ] ifFalse:[
+        cnfManagerName := self class resources at: 'Not configured'.
+    ].
+    srcManager notNil ifTrue:[
+        srcManagerName := cnfManager managerTypeName
+    ] ifFalse:[
+        srcManagerName := self class resources at: 'Unknown'.
+    ].
+
     dialog := DialogBox new.
     dialog label: package, ': source code managers does not match'.
     (dialog addTextLabel: 
@@ -53600,9 +53621,9 @@
             'for the package') withCRs) 
             adjust: #left.
     (dialog addTextLabel: 'Package: ', package) adjust: #left.
-    (dialog addTextLabel: 'Configured SCM: ', cnfManager managerTypeName) adjust: #left.
-    (dialog addTextLabel: 'Source SCM: ', srcManager managerTypeName) adjust: #left.
-    dialog addButton:(Button label:'Open SCM Settings' action:[self openSettingsDialogForSourceCodeManagement]).
+    (dialog addTextLabel: 'Configured SCM: ', cnfManagerName) adjust: #left.
+    (dialog addTextLabel: 'Source SCM: ', srcManagerName) adjust: #left.
+    dialog addButton:(Button label:'Open SCM Settings' action:[self openSettingsDialogAndSelectSourceCodeManagement]).
     dialog addOkButton.
 
     dialog open.
@@ -55678,11 +55699,11 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1698 2012-01-22 10:14:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1699 2012-01-23 23:15:39 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1698 2012-01-22 10:14:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1699 2012-01-23 23:15:39 vrany Exp $'
 !
 
 version_SVN