rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix the patch to account for recent upstream changes

Browse Source
This commit is contained in:
Christopher Aillon 2007-12-06 19:25:56 +00:00
parent b7c5c4d382
commit 0524fe12e1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firefox-2.0-startup-notify.patch
View File

@ -533,7 +533,7 @@ diff -d -u -p -r1.1492.2.121 configure
@@ -1163,7 +1172,7 @@ @@ -1163,7 +1172,7 @@
} }
static PRBool static RemoteResult
-RemoteCommandLine() -RemoteCommandLine()
+RemoteCommandLine(const char* aDesktopStartupID) +RemoteCommandLine(const char* aDesktopStartupID)
{ {
@ -654,11 +654,11 @@ diff -d -u -p -r1.1492.2.121 configure
if (!PR_GetEnv("MOZ_NO_REMOTE")) { if (!PR_GetEnv("MOZ_NO_REMOTE")) {
// Try to remote the entire command line. If this fails, start up normally. // Try to remote the entire command line. If this fails, start up normally.
- if (RemoteCommandLine()) - RemoteResult rr = RemoteCommandLine();
+ if (RemoteCommandLine(desktopStartupIDPtr)) + RemoteResult rr = RemoteCommandLine(desktopStartupIDPtr);
if (rr == REMOTE_FOUND)
return 0; return 0;
} else if (rr == REMOTE_ARG_BAD)
#endif
@@ -2533,6 +2601,13 @@ @@ -2533,6 +2601,13 @@
NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow"); NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
NS_ENSURE_SUCCESS(rv, 1); NS_ENSURE_SUCCESS(rv, 1);