Fixing botched trunk merge

git-svn-id: svn://10.0.0.236/trunk@159843 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/mail/components/gnome/nsMailGNOMEIntegration.cpp

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

mozilla/mailnews/base/public/nsIMapiRegistry.idl

@@ -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;

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistry.cpp

@@ -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