Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing botched trunk merge

Browse Source
This commit is contained in:
bryner%brianryner.com 2004-07-25 18:50:32 +00:00
parent 6e92b6ec80
commit 7c28fc3799
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/components/gnome/nsMailGNOMEIntegration.cpp
View File

@ -337,9 +337,3 @@ nsMailGNOMEIntegration::ShowMailIntegrationDialog(nsIDOMWindow* aParentWindow)
return rv;
}
NS_IMETHODIMP
nsMailGNOMEIntegration::RegisterMailAndNewsClient()
{
return NS_OK;
}

5
mailnews/base/public/nsIMapiRegistry.idl
View File

@ -48,10 +48,13 @@ interface nsIDOMWindow;
[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
interface nsIMapiRegistry: nsISupports {
/** This is set to TRUE if Mozilla is the default Application
/** This is set to TRUE if Mozilla is the default mail application
*/
attribute boolean isDefaultMailClient;
/* Set to TRUE if Mozilla is the default news application */
attribute boolean isDefaultNewsClient;
/** This is set TRUE only once per session.
*/
readonly attribute boolean showDialog;

14
mailnews/mapi/mapihook/src/nsMapiRegistry.cpp
View File

@ -72,6 +72,13 @@ nsMapiRegistry::GetIsDefaultMailClient(PRBool * retval) {
return NS_OK;
}
NS_IMETHODIMP
nsMapiRegistry::GetIsDefaultNewsClient(PRBool * retval) {
// XXX this needs merged from aviary branch
*retval = PR_FALSE;
return NS_OK;
}
NS_IMETHODIMP
nsMapiRegistry::GetShowDialog(PRBool * retval) {
*retval = m_ShowDialog;
@ -104,6 +111,13 @@ nsMapiRegistry::SetIsDefaultMailClient(PRBool aIsDefaultMailClient)
return rv ;
}
NS_IMETHODIMP
nsMapiRegistry::SetIsDefaultNewsClient(PRBool aIsDefaultNewsClient)
{
// XXX this needs merged from aviary branch
return NS_OK;
}
/** This will bring up the dialog box only once per session and
* only if the current app is not default Mail Client.
* This also checks the registry if the registry key