galeon-ns-with-service.patch

   1 diff -Nur galeon-0.11.3.orig/src/GaleonWrapper.cpp galeon-0.11.3/src/GaleonWrapper.cpp
   2 --- galeon-0.11.3.orig/src/GaleonWrapper.cpp    Wed Jul 25 00:43:50 2001
   3 +++ galeon-0.11.3/src/GaleonWrapper.cpp Sat Aug  4 05:39:19 2001
   4 @@ -124,7 +124,7 @@
   5                                                      GHFactory,
   6                                                      PR_TRUE);
   7
   8 -       NS_WITH_SERVICE(nsIGlobalHistory, inst, NS_GLOBALHISTORY_CONTRACTID, &result);
   9 +       nsCOMPtr<nsIGlobalHistory> inst = do_GetService(NS_GLOBALHISTORY_CONTRACTID, &result);
  10         dsHistory->SetGlobalHistory(inst);
  11
  12         nsCOMPtr<nsPIDOMWindow> piWin;
  13 diff -Nur galeon-0.11.3.orig/src/mozilla.cpp galeon-0.11.3/src/mozilla.cpp
  14 --- galeon-0.11.3.orig/src/mozilla.cpp  Sat Jul 21 21:38:14 2001
  15 +++ galeon-0.11.3/src/mozilla.cpp       Sat Aug  4 05:39:10 2001
  16 @@ -279,7 +279,7 @@
  17         nsresult result;
  18         GaleonWrapper *wrapper = (GaleonWrapper *)(embed->wrapper);
  19
  20 -       NS_WITH_SERVICE(nsIPrintOptions, options, kPrintOptionsCID, &result);
  21 +       nsCOMPtr<nsIPrintOptions> options = do_GetService(kPrintOptionsCID, &result);
  22         if (NS_FAILED(result)) return NS_ERROR_FAILURE;
  23
  24         if (info->pages)