Bustage fix for bug 339754
authordtownsend@oxymoronical.com
Thu, 11 Oct 2007 10:01:02 -0700
changeset 6832 fe5d559d04db1371095379fe492bb3278c857b2b
parent 6831 c41790eb9bfe6351d79e2f82c9c25d75cc480917
child 6833 ec7a67b38ebce26e858527733546e217a4fdbdbb
push idunknown
push userunknown
push dateunknown
bugs339754
milestone1.9a9pre
Bustage fix for bug 339754
xpinstall/public/nsISoftwareUpdate.h
xpinstall/src/nsSoftwareUpdate.cpp
xpinstall/src/nsSoftwareUpdate.h
--- a/xpinstall/public/nsISoftwareUpdate.h
+++ b/xpinstall/public/nsISoftwareUpdate.h
@@ -90,17 +90,17 @@ class nsISoftwareUpdate : public nsISupp
                                      const PRUnichar* URL,
                                      const PRUnichar* aName,
                                      PRBool aSelect,
                                      nsIXPIListener* aListener = 0) = 0;
 
             NS_IMETHOD RegisterListener(nsIXPIListener *aListener) = 0;
 
             /* FIX: these should be in a private interface */
-            NS_IMETHOD_(void) InstallJarCallBack() = 0;
+            virtual void InstallJarCallBack() = 0;
             NS_IMETHOD GetMasterListener(nsIXPIListener **aListener) = 0;
             NS_IMETHOD SetActiveListener(nsIXPIListener *aListener) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsISoftwareUpdate, NS_ISOFTWAREUPDATE_IID)
 
 #endif // nsISoftwareUpdate_h__
 
--- a/xpinstall/src/nsSoftwareUpdate.cpp
+++ b/xpinstall/src/nsSoftwareUpdate.cpp
@@ -353,17 +353,17 @@ nsSoftwareUpdate::InstallChrome( PRUint3
                     PR_GLOBAL_THREAD,
                     PR_UNJOINABLE_THREAD,
                     0);
 
     return NS_OK;
 }
 
 
-NS_IMETHODIMP_(void)
+void
 nsSoftwareUpdate::InstallJarCallBack()
 {
     PR_Lock(mLock);
 
     if (mJarInstallQueue.Count() != 0) // paranoia
     {
         nsInstallInfo *nextInstall = (nsInstallInfo*)mJarInstallQueue.ElementAt(0);
         if (nextInstall != nsnull)
--- a/xpinstall/src/nsSoftwareUpdate.h
+++ b/xpinstall/src/nsSoftwareUpdate.h
@@ -61,17 +61,17 @@ class nsSoftwareUpdate: public nsISoftwa
                                   nsIFile* aFile,
                                   const PRUnichar* URL,
                                   const PRUnichar* aName,
                                   PRBool aSelect,
                                   nsIXPIListener* aListener = 0);
 
         NS_IMETHOD RegisterListener(nsIXPIListener *aListener);
 
-        NS_IMETHOD_(void) InstallJarCallBack();
+        virtual void InstallJarCallBack();
         NS_IMETHOD GetMasterListener(nsIXPIListener **aListener);
         NS_IMETHOD SetActiveListener(nsIXPIListener *aListener);
 
         nsSoftwareUpdate();
         virtual ~nsSoftwareUpdate();
 
         static   PRBool             mNeedCleanup;