chasing the tree, not part of build

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

mozilla/xpinstall/standalone/makefile.win

@@ -21,7 +21,7 @@ PROGRAM = .\$(OBJDIR)\xpinstall.exe
 
 OBJS =  \
 	.\$(OBJDIR)\standalone.obj \
-    .\$(OBJDIR)\nsSimpleConsoleProgressNotifier.obj \
+    .\$(OBJDIR)\nsSimpleNotifier.obj \
 	$(NULL)
 
 LLIBS =                        \

mozilla/xpinstall/standalone/nsSimpleNotifier.cpp

@@ -22,52 +22,52 @@
  *     Douglas Turner <dougt@netscape.com>
  */
 
-#include "nsIXPInstallProgressNotifier.h"
-#include "nsSimpleConsoleProgressNotifier.h"
+#include "nsIXPINotifier.h"
+#include "nsSimpleNotifier.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 
 
-nsSimpleConsoleProgressNotifier::nsSimpleConsoleProgressNotifier()
+nsSimpleNotifier::nsSimpleNotifier()
 {}
 
-nsSimpleConsoleProgressNotifier::~nsSimpleConsoleProgressNotifier()
+nsSimpleNotifier::~nsSimpleNotifier()
 {}
 
-void
-nsSimpleConsoleProgressNotifier::BeforeJavascriptEvaluation(void)
+NS_IMETHODIMP
+nsSimpleNotifier::BeforeJavascriptEvaluation(void)
 {
     printf("Prior to evaluation of Install Script\n");
 }
 
-void
-nsSimpleConsoleProgressNotifier::AfterJavascriptEvaluation(void)
+NS_IMETHODIMP
+nsSimpleNotifier::AfterJavascriptEvaluation(void)
 {
     printf("After evaluation of Install Script\n");
 }
 
-void
-nsSimpleConsoleProgressNotifier::InstallStarted(const char* UIPackageName)
+NS_IMETHODIMP
+nsSimpleNotifier::InstallStarted(const char* UIPackageName)
 {
     printf("Installing: %s\n", UIPackageName);
 }
 
-long
-nsSimpleConsoleProgressNotifier::ItemScheduled(const char* message )
+NS_IMETHODIMP
+nsSimpleNotifier::ItemScheduled(const char* message )
 {
     printf("Scheduled Item:\t%s\n", message);
     return 0;
 }
 
-void
-nsSimpleConsoleProgressNotifier::InstallFinalization(const char* message, long itemNum, long totNum )
+NS_IMETHODIMP
+nsSimpleNotifier::InstallFinalization(const char* message, long itemNum, long totNum )
 {
     printf("Item: %s\t(%ld of %ld) Installed.\n", message, itemNum, totNum );
 }
 
-void
-nsSimpleConsoleProgressNotifier::InstallAborted(void)
+NS_IMETHODIMP
+nsSimpleNotifier::InstallAborted(void)
 {
     printf("Installation aborted.\n");
 }

mozilla/xpinstall/standalone/nsSimpleNotifier.h

@@ -24,24 +24,24 @@
  */
 
 
-#ifndef nsSimpleConsoleProgressNotifier_H__
-#define nsSimpleConsoleProgressNotifier_H__
+#ifndef nsSimpleNotifier_H__
+#define nsSimpleNotifier_H__
 
-#include "nsIXPInstallProgressNotifier.h"
+#include "nsIXPINotifier.h"
 
-class nsSimpleConsoleProgressNotifier : public nsIXPInstallProgressNotifier
+class nsSimpleNotifier : public nsIXPINotifier
 {
     public:
 
-        nsSimpleConsoleProgressNotifier();
-        virtual ~nsSimpleConsoleProgressNotifier();
+        nsSimpleNotifier();
+        virtual ~nsSimpleNotifier();
        
-        void BeforeJavascriptEvaluation(void);
-        void AfterJavascriptEvaluation(void);
-        void InstallStarted(const char* UIPackageName);
-        long ItemScheduled(const char* message );
-        void InstallFinalization(const char* message, long itemNum, long totNum );
-        void InstallAborted(void);
+        NS_IMETHOD BeforeJavascriptEvaluation();
+        NS_IMETHOD AfterJavascriptEvaluation();
+        NS_IMETHOD InstallStarted(const char *UIPackageName);
+        NS_IMETHOD ItemScheduled(const char *message);
+        NS_IMETHOD InstallFinalization(const char *message, PRInt32 itemNum, PRInt32 totNum);
+        NS_IMETHOD InstallAborted();
 };
 
 #endif

mozilla/xpinstall/standalone/standalone.cpp

@@ -27,7 +27,7 @@
 #include "nscore.h"
 #include "nspr.h"
 
-#include "nsSimpleConsoleProgressNotifier.h"
+#include "nsSimpleNotifier.h"
 
 /*********************************************
  SoftwareUpdate
@@ -99,7 +99,7 @@ main(int argc, char **argv)
     if (NS_SUCCEEDED(rv))
     {
 
-        nsSimpleConsoleProgressNotifier *progress = new nsSimpleConsoleProgressNotifier();
+        nsSimpleNotifier *progress = new nsSimpleNotifier();
 
         softwareUpdate->RegisterNotifier(progress);