rpms/firefox/devel firefox-2.0-startup-notify.patch,1.3,1.4

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14193

Modified Files:
	firefox-2.0-startup-notify.patch 
Log Message:
Fix the patch to account for recent upstream changes


firefox-2.0-startup-notify.patch:

Index: firefox-2.0-startup-notify.patch
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox-2.0-startup-notify.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- firefox-2.0-startup-notify.patch	19 Oct 2007 01:43:55 -0000	1.3
+++ firefox-2.0-startup-notify.patch	6 Dec 2007 19:25:56 -0000	1.4
@@ -533,7 +533,7 @@
 @@ -1163,7 +1172,7 @@
  }
  
- static PRBool
+ static RemoteResult
 -RemoteCommandLine()
 +RemoteCommandLine(const char* aDesktopStartupID)
  {
@@ -654,11 +654,11 @@
  
    if (!PR_GetEnv("MOZ_NO_REMOTE")) {
      // Try to remote the entire command line. If this fails, start up normally.
--    if (RemoteCommandLine())
-+    if (RemoteCommandLine(desktopStartupIDPtr))
+-    RemoteResult rr = RemoteCommandLine();
++    RemoteResult rr = RemoteCommandLine(desktopStartupIDPtr);
+     if (rr == REMOTE_FOUND)
        return 0;
-   }
- #endif
+     else if (rr == REMOTE_ARG_BAD)
 @@ -2533,6 +2601,13 @@
        NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
        NS_ENSURE_SUCCESS(rv, 1);