Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/songbird-06-donot-delay-stopping-realplayer.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3062 2a7bf2823c88
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3062
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     1
 
--- firefox/layout/generic/nsObjectFrame.cpp.orig	2008-08-19 18:05:29.971589219 +0800
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     2
 
+++ firefox/layout/generic/nsObjectFrame.cpp	2008-08-19 18:02:21.477682134 +0800
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     3
 
@@ -1772,10 +1772,13 @@
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     4
 
 static PRBool
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     5
 
 DoDelayedStop(nsPluginInstanceOwner *aInstanceOwner, PRBool aDelayedStop)
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     6
 
 {
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     7
 
-  // Don't delay stopping QuickTime (bug 425157), Flip4Mac (bug 426524).
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     8
 
+  // Don't delay stopping QuickTime (bug 425157), Flip4Mac (bug 426524),
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     9
 
+  // RealPlayer/Helix (bug 451007).
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    10
 
   if (aDelayedStop &&
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    11
 
       !::MatchPluginName(aInstanceOwner, "QuickTime") &&
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    12
 
-      !::MatchPluginName(aInstanceOwner, "Flip4Mac")) {
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    13
 
+      !::MatchPluginName(aInstanceOwner, "Flip4Mac") &&
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    14
 
+      !::MatchPluginName(aInstanceOwner, "RealPlayer") &&
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    15
 
+      !::MatchPluginName(aInstanceOwner, "Helix")) {
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    16
 
     nsCOMPtr<nsIRunnable> evt = new nsStopPluginRunnable(aInstanceOwner);
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    17
 
     NS_DispatchToCurrentThread(evt);
2a7bf2823c88 2010-12-07 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    18
 
     return PR_TRUE;
upstream/spec-files-extra