зеркало из https://github.com/mozilla/gecko-dev.git
Bug 934538: Remove remaining references to Growl, including the license. r=wchen
This commit is contained in:
Родитель
98c132e989
Коммит
3953712d92
|
@ -24,9 +24,7 @@ interface nsIAlertsService : nsISupports
|
|||
* @param alertListener Used for callbacks. May be null if the caller
|
||||
* doesn't care about callbacks.
|
||||
* @param name The name of the notification. This is currently
|
||||
* only used on OS X with Growl and Android.
|
||||
* On OS X with Growl, users can disable notifications
|
||||
* with a given name. On Android the name is hashed
|
||||
* only used on Android. On Android the name is hashed
|
||||
* and used as a notification ID. Notifications will
|
||||
* replace previous notifications with the same name.
|
||||
* @param dir Bidi override for the title. Valid values are
|
||||
|
|
|
@ -53,7 +53,7 @@ function runTest() {
|
|||
ok(true, "Alerts service is available");
|
||||
} catch (ex) {
|
||||
todo(false,
|
||||
"Alerts service is not available. (Mac OS X without Growl?)", ex);
|
||||
"Alerts service is not available.", ex);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -64,7 +64,7 @@ function runTest() {
|
|||
false, "foobarcookie", observer);
|
||||
ok(true, "showAlertNotification() succeeded. Waiting for notification...");
|
||||
} catch (ex) {
|
||||
todo(false, "showAlertNotification() failed. (Mac OS X without Growl?)", ex);
|
||||
todo(false, "showAlertNotification() failed.", ex);
|
||||
SimpleTest.finish();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ if (!("@mozilla.org/alerts-service;1" in Cc)) {
|
|||
getService(Ci.nsIAlertsService);
|
||||
ok(true, "Alerts service is available");
|
||||
} catch (ex) {
|
||||
todo(false, "Alerts service is not available. (Mac OS X without Growl?)", ex);
|
||||
todo(false, "Alerts service is not available.", ex);
|
||||
}
|
||||
|
||||
if (notifier) {
|
||||
|
@ -46,7 +46,7 @@ if (!("@mozilla.org/alerts-service;1" in Cc)) {
|
|||
|
||||
gNotificationIsAvailable = true;
|
||||
} catch (ex) {
|
||||
todo(false, "showAlertNotification() failed. (Mac OS X without Growl?)", ex);
|
||||
todo(false, "showAlertNotification() failed.", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -83,7 +83,6 @@
|
|||
<li><a href="about:license#gears">Google Gears License</a></li>
|
||||
<li><a href="about:license#gears-istumbler">Google Gears/iStumbler License</a></li>
|
||||
<li><a href="about:license#vp8">Google VP8 License</a></li>
|
||||
<li><a href="about:license#growl">Growl License</a></li>
|
||||
<li><a href="about:license#gyp">gyp License</a></li>
|
||||
<li><a href="about:license#halloc">halloc License</a></li>
|
||||
<li><a href="about:license#harfbuzz">HarfBuzz License</a></li>
|
||||
|
@ -2260,48 +2259,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
</pre>
|
||||
|
||||
|
||||
|
||||
<hr>
|
||||
<h1><a id="growl"></a>Growl License</h1>
|
||||
|
||||
<p>This license applies to certain files in the directory
|
||||
<span class="path">toolkit/components/alerts/mac/growl/</span>.
|
||||
(This code only ships in the Mac OS X version of the product.)
|
||||
|
||||
<pre>
|
||||
Copyright (c) The Growl Project, 2004-2011
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
|
||||
1. Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
3. Neither the name of Growl nor the names of its contributors
|
||||
may be used to endorse or promote products derived from this software
|
||||
without specific prior written permission.
|
||||
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
</pre>
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
<h1><a id="gyp"></a>gyp License</h1>
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче