mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-14 20:22:00 +00:00
Bug 287832 Clean up nsDirPrefs.cpp. Part 3 - Remove some redundant DIR_Server attributes. r/sr=bienvenu
This commit is contained in:
bugzilla%standard8.demon.co.uk
parent
6ae244fb31
commit
e9a141b5ed
@ -111,11 +111,6 @@ typedef enum
|
||||
|
||||
#endif /* #if !defined(MOZADDRSTANDALONE) */
|
||||
|
||||
#define XP_FILE_URL_PATH char *
|
||||
#define XP_FILE_NATIVE_PATH char *
|
||||
|
||||
XP_FILE_URL_PATH XP_PlatformFileToURL (const XP_FILE_NATIVE_PATH ) {return NULL;}
|
||||
|
||||
/*****************************************************************************
|
||||
* Private structs and stuff
|
||||
*/
|
||||
@ -192,9 +187,6 @@ typedef struct DIR_Filter
|
||||
#define kDefaultReplicaFilter "(objectclass=*)"
|
||||
#define kDefaultReplicaExcludedAttributes nsnull
|
||||
|
||||
#define kDefaultPABColumnHeaders "cn,mail,o,nickname,telephonenumber,l" /* default column headers for the address book window */
|
||||
#define kDefaultLDAPColumnHeaders "cn,mail,o,telephonenumber,l,nickname"
|
||||
|
||||
static PRBool dir_IsServerDeleted(DIR_Server * server);
|
||||
static DIR_DefaultAttribute *DIR_GetDefaultAttribute (DIR_AttributeId id);
|
||||
static char *DIR_GetStringPref(const char *prefRoot, const char *prefLeaf, const char *defaultValue);
|
||||
@ -515,25 +507,14 @@ nsresult DIR_IncrementServerRefCount (DIR_Server *server)
|
||||
nsresult DIR_InitServerWithType(DIR_Server * server, DirectoryType dirType)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(server);
|
||||
DIR_InitServer(server);
|
||||
nsresult rv = DIR_InitServer(server);
|
||||
|
||||
server->dirType = dirType;
|
||||
if (dirType == LDAPDirectory)
|
||||
{
|
||||
server->columnAttributes = nsCRT::strdup(kDefaultLDAPColumnHeaders);
|
||||
server->isOffline = PR_TRUE;
|
||||
server->csid = CS_UTF8;
|
||||
server->locale = nsnull;
|
||||
}
|
||||
else if (dirType == PABDirectory || dirType == MAPIDirectory)
|
||||
{
|
||||
server->columnAttributes = nsCRT::strdup(kDefaultPABColumnHeaders);
|
||||
server->isOffline = PR_FALSE;
|
||||
server->csid = CS_UTF8;
|
||||
// server->csid = INTL_GetCharSetID(INTL_DefaultTextWidgetCsidSel);
|
||||
server->locale = nsnull; /* get the locale we are going to use with this AB */
|
||||
/* server->locale = INTL_GetCollationKeyLocale(nsnull); */
|
||||
}
|
||||
return NS_OK;
|
||||
server->csid = CS_UTF8;
|
||||
server->locale = nsnull;
|
||||
server->isOffline = (dirType == LDAPDirectory);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
nsresult DIR_InitServer (DIR_Server *server)
|
||||
@ -683,13 +664,6 @@ nsresult DIR_CopyServer (DIR_Server *in, DIR_Server **out)
|
||||
err = NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
if (in->columnAttributes)
|
||||
{
|
||||
(*out)->columnAttributes = nsCRT::strdup(in->columnAttributes);
|
||||
if (!(*out)->columnAttributes)
|
||||
err = NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
if (in->locale)
|
||||
{
|
||||
(*out)->locale = nsCRT::strdup(in->locale);
|
||||
@ -805,8 +779,6 @@ nsresult DIR_CopyServer (DIR_Server *in, DIR_Server **out)
|
||||
dir_CopyTokenList (in->uriAttributes, in->uriAttributesCount,
|
||||
&(*out)->uriAttributes, &(*out)->uriAttributesCount);
|
||||
|
||||
if (in->customDisplayUrl)
|
||||
(*out)->customDisplayUrl = nsCRT::strdup (in->customDisplayUrl);
|
||||
if (in->searchPairList)
|
||||
(*out)->searchPairList = nsCRT::strdup (in->searchPairList);
|
||||
|
||||
@ -1143,12 +1115,6 @@ DIR_PrefId DIR_AtomizePrefName(const char *prefname)
|
||||
case 's': /* the new csid pref that replaced char set */
|
||||
rc = idCSID;
|
||||
break;
|
||||
case 'o': /* columns */
|
||||
rc = idColumnAttributes;
|
||||
break;
|
||||
case 'u': /* customDisplayUrl */
|
||||
rc = idCustomDisplayUrl;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1486,7 +1452,6 @@ static nsresult dir_DeleteServerContents (DIR_Server *server)
|
||||
PR_FREEIF (server->tokenSeps);
|
||||
PR_FREEIF (server->authDn);
|
||||
PR_FREEIF (server->password);
|
||||
PR_FREEIF (server->columnAttributes);
|
||||
PR_FREEIF (server->locale);
|
||||
PR_FREEIF (server->uri);
|
||||
|
||||
@ -1524,7 +1489,6 @@ static nsresult dir_DeleteServerContents (DIR_Server *server)
|
||||
if (server->replInfo)
|
||||
dir_DeleteReplicationInfo (server);
|
||||
|
||||
PR_FREEIF (server->customDisplayUrl);
|
||||
PR_FREEIF (server->searchPairList);
|
||||
}
|
||||
return NS_OK;
|
||||
@ -2574,12 +2538,6 @@ void DIR_GetPrefsForOneServer (DIR_Server *server, PRBool reinitialize, PRBool o
|
||||
server->saveResults = PR_TRUE; /* never let someone delete their PAB this way */
|
||||
}
|
||||
|
||||
/* load in the column attributes */
|
||||
if (server->dirType == PABDirectory || server->dirType == MAPIDirectory)
|
||||
server->columnAttributes = DIR_GetStringPref(prefstring, "columns", kDefaultPABColumnHeaders);
|
||||
else
|
||||
server->columnAttributes = DIR_GetStringPref(prefstring, "columns", kDefaultLDAPColumnHeaders);
|
||||
|
||||
server->fileName = DIR_GetStringPref (prefstring, "filename", "");
|
||||
if ( (!server->fileName || !*(server->fileName)) && !oldstyle) /* if we don't have a file name and this is the new branch get a file name */
|
||||
DIR_SetServerFileName (server, server->serverName);
|
||||
@ -2658,8 +2616,6 @@ void DIR_GetPrefsForOneServer (DIR_Server *server, PRBool reinitialize, PRBool o
|
||||
prefBool = DIR_GetBoolPref (prefstring, "vlvDisabled", kDefaultVLVDisabled);
|
||||
DIR_ForceFlag (server, DIR_LDAP_VLV_DISABLED | DIR_LDAP_ROOTDSE_PARSED, prefBool);
|
||||
|
||||
server->customDisplayUrl = DIR_GetStringPref (prefstring, "customDisplayUrl", "");
|
||||
|
||||
if (!oldstyle /* we don't care about saving old directories */ && forcePrefSave && !dir_IsServerDeleted(server) )
|
||||
DIR_SavePrefsForOneServer(server);
|
||||
}
|
||||
@ -3350,12 +3306,6 @@ void DIR_SavePrefsForOneServer(DIR_Server *server)
|
||||
if (server->dirType == LDAPDirectory)
|
||||
DIR_SetStringPref(prefstring, "uri", server->uri, "");
|
||||
|
||||
/* save the column attributes */
|
||||
if (server->dirType == PABDirectory || server->dirType == MAPIDirectory)
|
||||
DIR_SetStringPref(prefstring, "columns", server->columnAttributes, kDefaultPABColumnHeaders);
|
||||
else
|
||||
DIR_SetStringPref(prefstring, "columns", server->columnAttributes, kDefaultLDAPColumnHeaders);
|
||||
|
||||
DIR_SetBoolPref(prefstring, "autoComplete.enabled", DIR_TestFlag(server, DIR_AUTO_COMPLETE_ENABLED), kDefaultAutoCompleteEnabled);
|
||||
DIR_SetStringPref(prefstring, "autoComplete.filter", server->autoCompleteFilter, nsnull);
|
||||
DIR_SetBoolPref(prefstring, "autoComplete.never", DIR_TestFlag(server, DIR_AUTO_COMPLETE_NEVER), kDefaultAutoCompleteNever);
|
||||
@ -3414,8 +3364,6 @@ void DIR_SavePrefsForOneServer(DIR_Server *server)
|
||||
DIR_SetIntPref (prefstring, "PalmCategoryId", server->PalmCategoryId, -1);
|
||||
DIR_SetIntPref (prefstring, "PalmSyncTimeStamp", server->PalmSyncTimeStamp, 0);
|
||||
|
||||
DIR_SetStringPref (prefstring, "customDisplayUrl", server->customDisplayUrl, "");
|
||||
|
||||
DIR_ClearFlag(server, DIR_SAVING_SERVER);
|
||||
}
|
||||
|
||||
|
||||
@ -115,14 +115,6 @@ typedef enum
|
||||
homephone
|
||||
} DIR_AttributeId;
|
||||
|
||||
/* these enumerated types are returned by DIR_ValidateDirectoryDescription for validating a description name */
|
||||
typedef enum
|
||||
{
|
||||
DIR_ValidDescription = 0,
|
||||
DIR_DuplicateDescription,
|
||||
DIR_InvalidDescription
|
||||
} DIR_DescriptionCode;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
idNone = 0, /* Special value */
|
||||
@ -156,7 +148,6 @@ typedef enum
|
||||
idAutoCompleteEnabled,
|
||||
idAutoCompleteFilter,
|
||||
idTokenSeps,
|
||||
idColumnAttributes,
|
||||
idDnAttributes,
|
||||
idDnAttributesCount,
|
||||
idSuppressedAttributes,
|
||||
@ -165,7 +156,6 @@ typedef enum
|
||||
idUriAttributesCount,
|
||||
idBasicSearchAttributes,
|
||||
idBasicSearchAttributesCount,
|
||||
idCustomDisplayUrl,
|
||||
idAuthDn,
|
||||
idPassword,
|
||||
idSearchPairList,
|
||||
@ -239,9 +229,6 @@ typedef struct DIR_Server
|
||||
char *tokenSeps;
|
||||
char *autoCompleteFilter;
|
||||
|
||||
/* site-configurable display column attributes */
|
||||
char *columnAttributes; /* comma separated list of display columns */
|
||||
|
||||
/* site-configurable list of attributes whose values are DNs */
|
||||
char **dnAttributes;
|
||||
PRInt32 dnAttributesCount;
|
||||
@ -258,9 +245,6 @@ typedef struct DIR_Server
|
||||
DIR_AttributeId *basicSearchAttributes;
|
||||
PRInt32 basicSearchAttributesCount;
|
||||
|
||||
/* site-configurable URL to open LDAP results */
|
||||
char *customDisplayUrl;
|
||||
|
||||
/* authentication fields */
|
||||
char *authDn; /* DN to give to authenticate as */
|
||||
char *password; /* Password for the DN */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user