зеркало из https://github.com/mozilla/pjs.git
Fix for 196222. Set directory pref name in CreateDirectoryByURI() and enable Properties cmd for all addrbooks. r/sr=sspitzer.
This commit is contained in:
Родитель
4719c0e0b9
Коммит
b6f372692c
|
@ -184,15 +184,7 @@ var DirPaneController =
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
case "button_edit":
|
case "button_edit":
|
||||||
selectedDir = GetSelectedDirectory();
|
return (GetSelectedDirectory() != null);
|
||||||
if (selectedDir) {
|
|
||||||
var directory = GetDirectoryFromURI(selectedDir);
|
|
||||||
var properties = directory.directoryProperties;
|
|
||||||
if ((directory.isMailList) ||
|
|
||||||
(properties.dirType == kLDAPDirectory || properties.dirType == kPABDirectory))
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -337,6 +337,9 @@ NS_IMETHODIMP nsAbBSDirectory::CreateDirectoryByURI(const PRUnichar *aDisplayNam
|
||||||
rv = properties->SetURI(aURI);
|
rv = properties->SetURI(aURI);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
|
||||||
|
rv = properties->SetPrefName(server->prefName);
|
||||||
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
|
||||||
rv = CreateDirectoriesFromFactory(properties, server, PR_TRUE /* notify */);
|
rv = CreateDirectoriesFromFactory(properties, server, PR_TRUE /* notify */);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
return rv;
|
return rv;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче