packages (DEVEL): iceape/iceape-branding.patch - updated for 2.0, probably ...
hawk
hawk at pld-linux.org
Sun Oct 25 15:05:54 CET 2009
Author: hawk Date: Sun Oct 25 14:05:54 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- updated for 2.0, probably not complete yet
---- Files affected:
packages/iceape:
iceape-branding.patch (1.7 -> 1.7.2.1)
---- Diffs:
================================================================
Index: packages/iceape/iceape-branding.patch
diff -u packages/iceape/iceape-branding.patch:1.7 packages/iceape/iceape-branding.patch:1.7.2.1
--- packages/iceape/iceape-branding.patch:1.7 Wed Mar 25 01:12:30 2009
+++ packages/iceape/iceape-branding.patch Sun Oct 25 15:05:49 2009
@@ -1,212 +1,189 @@
-diff -urN mozilla.orig/configure mozilla/configure
---- mozilla.orig/configure 2008-07-29 13:31:43.000000000 +0200
-+++ mozilla/configure 2008-07-29 13:34:10.000000000 +0200
-@@ -13071,8 +13071,8 @@
-
- case "$MOZ_BUILD_APP" in
- suite)
-- MOZ_APP_NAME=seamonkey
-- MOZ_APP_DISPLAYNAME=SeaMonkey
-+ MOZ_APP_NAME=iceape
-+ MOZ_APP_DISPLAYNAME=Iceape
- MOZ_MAIL_NEWS=1
- MOZ_LDAP_XPCOM=1
- MOZ_COMPOSER=1
-diff -urN mozilla.orig/configure.in mozilla/configure.in
---- mozilla.orig/configure.in 2008-07-29 13:31:06.000000000 +0200
-+++ mozilla/configure.in 2008-07-29 13:34:10.000000000 +0200
-@@ -4303,8 +4303,8 @@
-
- case "$MOZ_BUILD_APP" in
- suite)
-- MOZ_APP_NAME=seamonkey
-- MOZ_APP_DISPLAYNAME=SeaMonkey
-+ MOZ_APP_NAME=iceape
-+ MOZ_APP_DISPLAYNAME=Iceape
- MOZ_MAIL_NEWS=1
- MOZ_LDAP_XPCOM=1
- MOZ_COMPOSER=1
-diff -urN mozilla.orig/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml
---- mozilla.orig/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml 2008-07-29 13:31:51.000000000 +0200
-+++ mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml 2008-07-29 13:34:10.000000000 +0200
-@@ -387,19 +387,6 @@
- web sites in the current list.</li>
- </ul>
- </li>
-- <li><strong>Check for updates</strong>: Select this to be notified when new
-- versions of &brandShortName; are available. Your personal information is
-- not shared with &brandShortName; when verifying your version of
-- &brandShortName;.
-- <ul>
-- <li><strong>weekly</strong>: Choose this if you want &brandShortName; to
-- check once a week to see if a new version of &brandShortName; is
-- available.</li>
-- <li><strong>monthly</strong>: Choose this if you want &brandShortName; to
-- check once a month to see if a new version of &brandShortName; is
-- available.</li>
-- </ul>
-- </li>
- </ul>
-
- <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
-diff -urN mozilla.orig/mailnews/base/resources/content/start.xhtml mozilla/mailnews/base/resources/content/start.xhtml
---- mozilla.orig/mailnews/base/resources/content/start.xhtml 2008-07-29 13:31:33.000000000 +0200
-+++ mozilla/mailnews/base/resources/content/start.xhtml 2008-07-29 13:34:10.000000000 +0200
-@@ -72,8 +72,6 @@
- <h2>&dict.title;</h2>
- <p>&dict_intro.label;</p>
- <p>&dict_info.label;</p>
--<h2>&info.title;</h2>
--<p>&info_bugs.label;</p>
- </div>
-
- </body>
-diff -urN mozilla.orig/mailnews/base/resources/locale/en-US/start.dtd mozilla/mailnews/base/resources/locale/en-US/start.dtd
---- mozilla.orig/mailnews/base/resources/locale/en-US/start.dtd 2008-07-29 13:31:33.000000000 +0200
-+++ mozilla/mailnews/base/resources/locale/en-US/start.dtd 2008-07-29 13:34:10.000000000 +0200
-@@ -37,7 +37,7 @@
-
- <!ENTITY startpage.title "Welcome to &brandShortName; Mail & Newsgroups">
- <!ENTITY headline.label
--'Welcome to <a href="&vendorURL;">&brandShortName;</a> Mail & Newsgroups!'>
-+'Welcome to &brandShortName; Mail & Newsgroups!'>
- <!ENTITY description.label
- "&brandShortName; Mail & Newsgroups is a powerful open-source mail and news
- client, supporting advanced junk mail detection and other useful features.">
-diff -urN mozilla.orig/netwerk/protocol/about/src/nsAboutRedirector.cpp mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp
---- mozilla.orig/netwerk/protocol/about/src/nsAboutRedirector.cpp 2008-07-29 13:31:32.000000000 +0200
-+++ mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp 2008-07-29 13:34:10.000000000 +0200
-@@ -64,7 +64,7 @@
- { "mozilla", "chrome://global/content/mozilla.xhtml", PR_TRUE },
- { "plugins", "chrome://global/content/plugins.html", PR_FALSE },
- { "config", "chrome://global/content/config.xul", PR_FALSE },
-- { "logo", "chrome://global/content/logo.gif", PR_TRUE },
-+ { "logo", "chrome://global/content/logo.png", PR_TRUE },
- { "buildconfig", "chrome://global/content/buildconfig.html", PR_TRUE },
- { "license", "chrome://global/content/license.html", PR_TRUE },
- { "licence", "chrome://global/content/license.html", PR_TRUE },
-diff -urN mozilla.orig/suite/branding/Makefile.in mozilla/suite/branding/Makefile.in
---- mozilla.orig/suite/branding/Makefile.in 2008-07-29 13:31:43.000000000 +0200
-+++ mozilla/suite/branding/Makefile.in 2008-07-29 13:34:10.000000000 +0200
-@@ -49,4 +49,11 @@
- $(INSTALL) $(srcdir)/icons/gtk/seamonkey.png $(DIST)/bin/chrome/icons/default
- endif
-
-+install::
-+ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
-+ $(SYSINSTALL) $(IFLAGS1) $(srcdir)/icons/gtk/default.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default
-+ $(SYSINSTALL) $(IFLAGS1) $(srcdir)/icons/gtk/default16.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default
-+ $(SYSINSTALL) $(IFLAGS1) $(srcdir)/icons/gtk/seamonkey.png $(DESTDIR)$(mozappdir)/chrome/icons/default
-+endif
-+
- include $(topsrcdir)/config/rules.mk
-diff -urN mozilla.orig/themes/classic/jar.mn mozilla/themes/classic/jar.mn
---- mozilla.orig/themes/classic/jar.mn 2008-07-29 13:31:02.000000000 +0200
-+++ mozilla/themes/classic/jar.mn 2008-07-29 13:34:10.000000000 +0200
-@@ -65,7 +65,6 @@
- skin/classic/communicator/icons/lock-broken.gif (communicator/icons/lock-broken.gif)
- skin/classic/communicator/icons/lock-insecure.gif (communicator/icons/lock-insecure.gif)
- skin/classic/communicator/icons/loading.gif (communicator/icons/loading.gif)
-- skin/classic/communicator/icons/turbo-systray.gif (communicator/icons/turbo-systray.gif)
- skin/classic/communicator/icons/btn1.gif (communicator/icons/btn1.gif)
- skin/classic/communicator/icons/smileys/smile_n.gif (communicator/icons/smileys/smile_n.gif)
- skin/classic/communicator/icons/smileys/frown_n.gif (communicator/icons/smileys/frown_n.gif)
-diff -urN mozilla.orig/themes/modern/jar.mn mozilla/themes/modern/jar.mn
---- mozilla.orig/themes/modern/jar.mn 2008-07-29 13:31:03.000000000 +0200
-+++ mozilla/themes/modern/jar.mn 2008-07-29 13:34:10.000000000 +0200
-@@ -36,7 +36,6 @@
- skin/modern/communicator/icons/lock-secure.gif (communicator/icons/lock-secure.gif)
- skin/modern/communicator/icons/offline.gif (communicator/icons/offline.gif)
- skin/modern/communicator/icons/online.gif (communicator/icons/online.gif)
-- skin/modern/communicator/icons/turbo-systray.gif (communicator/icons/turbo-systray.gif)
- skin/modern/communicator/icons/btn1.gif (communicator/icons/btn1.gif)
- skin/modern/communicator/icons/search.gif (communicator/icons/search.gif)
- skin/modern/communicator/icons/smileys/smile_n.gif (communicator/icons/smileys/smile_n.gif)
-diff -urN mozilla.orig/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
---- mozilla.orig/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties 2008-07-29 13:32:00.000000000 +0200
-+++ mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties 2008-07-29 14:10:57.000000000 +0200
-@@ -32,8 +32,8 @@
- disableQueryMessage=Do you want to disable %S?
-
- extensions.update.url=https://addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%
--extensions.getMoreExtensionsURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/
--extensions.getMoreThemesURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/
-+extensions.getMoreExtensionsURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/seamonkey/%VERSION%/extensions/
-+extensions.getMoreThemesURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/seamonkey/%VERSION%/themes/
-
- themesTitle=Themes
- extensionsTitle=Extensions
-diff -urN mozilla.orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
---- mozilla.orig/toolkit/xre/nsAppRunner.cpp 2008-07-29 13:32:01.000000000 +0200
-+++ mozilla/toolkit/xre/nsAppRunner.cpp 2008-07-29 13:34:10.000000000 +0200
-@@ -1121,7 +1121,7 @@
- static void
+diff -urN mozilla.orig/editor/ui/locales/en-US/chrome/region/region.properties mozilla/editor/ui/locales/en-US/chrome/region/region.properties
+--- mozilla.orig/editor/ui/locales/en-US/chrome/region/region.properties 2009-10-17 15:48:19.000000000 +0200
++++ mozilla/editor/ui/locales/en-US/chrome/region/region.properties 2009-10-24 13:36:13.000000000 +0200
+@@ -1,4 +1,4 @@
+ #
+ # editor.js
+ # editor.properties
+-editor.throbber.url=http://www.seamonkey-project.org/
++editor.throbber.url=http://www.pld-linux.org/Packages/Iceape
+diff -urN mozilla.orig/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js mozilla/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js
+--- mozilla.orig/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js 2009-10-17 15:53:53.000000000 +0200
++++ mozilla/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js 2009-10-24 13:36:13.000000000 +0200
+@@ -413,7 +413,7 @@
+ catch(ex) {}
+ // only works on Gecko 1.8 and higher (if above doesn't return)
+ if ('nsIChromeRegistrySea' in Components.interfaces) {
+- return 'SeaMonkey/'+
++ return 'Iceape/'+
+ Components.classes['@mozilla.org/network/io-service;1']
+ .getService(Components.interfaces.nsIIOService)
+ .getProtocolHandler('http')
+diff -urN mozilla.orig/mozilla/toolkit/content/about.xhtml mozilla/mozilla/toolkit/content/about.xhtml
+--- mozilla.orig/mozilla/toolkit/content/about.xhtml 2009-10-17 15:54:53.000000000 +0200
++++ mozilla/mozilla/toolkit/content/about.xhtml 2009-10-24 13:36:13.000000000 +0200
+@@ -68,9 +68,6 @@
+ <ul id="aboutPageList">
+ <li>&about.copy.beforeLink; <a href="about:credits">&about.copy.linkTitle;</a> &about.copy.afterLink;</li>
+ <li>&about.license.beforeLink; <a href="about:license">&about.license.linkTitle;</a> &about.license.afterLink;</li>
+- <!-- Release notes link removed pending fix for bug 349985
+- <li>&about.relnotes.beforeLink; <a id="releaseNotesURL" href="">&about.relnotes.linkTitle;</a> &about.relnotes.afterLink;</li>
+- -->
+ <li>&about.buildconfig.beforeLink; <a href="about:buildconfig">&about.buildconfig.linkTitle;</a> &about.buildconfig.afterLink;</li>
+ <script type="application/javascript">
+ // get release notes URL from prefs
+diff -urN mozilla.orig/mozilla/toolkit/xre/nsAppRunner.cpp mozilla/mozilla/toolkit/xre/nsAppRunner.cpp
+--- mozilla.orig/mozilla/toolkit/xre/nsAppRunner.cpp 2009-10-17 15:55:06.000000000 +0200
++++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2009-10-24 13:36:13.000000000 +0200
+@@ -1236,8 +1236,7 @@
+ static inline void
DumpVersion()
{
-- printf("%s %s %s, %s\n", gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version, gAppData->copyright);
-+ printf("%s %s, %s\n", gAppData->name, gAppData->version, gAppData->copyright);
- }
-
- #ifdef MOZ_ENABLE_XREMOTE
-diff -urN mozilla.orig/xpfe/bootstrap/nsAppRunner.cpp mozilla/xpfe/bootstrap/nsAppRunner.cpp
---- mozilla.orig/xpfe/bootstrap/nsAppRunner.cpp 2008-07-29 13:32:15.000000000 +0200
-+++ mozilla/xpfe/bootstrap/nsAppRunner.cpp 2008-07-29 13:34:10.000000000 +0200
-@@ -1510,7 +1510,7 @@
- || (PL_strcasecmp(argv[i], "/?") == 0)
- #endif /* XP_WIN || XP_OS2 */
- ) {
-- DumpHelp(argv[0]);
-+ DumpHelp(NS_STRINGIFY(MOZ_APP_DISPLAYNAME));
- return PR_TRUE;
- }
- if ((PL_strcasecmp(argv[i], "-v") == 0)
-diff -urN mozilla.orig/xpfe/browser/resources/locale/en-US/region.properties mozilla/xpfe/browser/resources/locale/en-US/region.properties
---- mozilla.orig/xpfe/browser/resources/locale/en-US/region.properties 2008-07-29 13:32:16.000000000 +0200
-+++ mozilla/xpfe/browser/resources/locale/en-US/region.properties 2008-07-29 13:34:10.000000000 +0200
-@@ -1,5 +1,5 @@
- # navigator.properties
--homePageDefault=http://www.mozilla.org/
-+homePageDefault=about:
- keywordList=http://home.netscape.com/escapes/keywords
- webmailKeyword=http://webmail.netscape.com
- fallbackDefaultSearchURL=http://www.google.com/search?q=
-@@ -7,8 +7,8 @@
- #
- # all.js
- #
--browser.startup.homepage=http://www.seamonkey-project.org/start/
-+browser.startup.homepage=about:
--browser.throbber.url=http://www.seamonkey-project.org/
-+browser.throbber.url=http://www.pld-linux.org/Packages/Iceape
- browser.search.defaulturl=http://www.google.com/search?q=
- general.useragent.contentlocale=US
+- printf("%s %s %s",
+- gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version);
++ printf("%s %s", gAppData->name, gAppData->version);
+ if (gAppData->copyright)
+ printf(", %s", gAppData->copyright);
+ printf("\n");
+diff -urN mozilla.orig/mozilla/xpfe/bootstrap/appleevents/mozilla.sdef mozilla/mozilla/xpfe/bootstrap/appleevents/mozilla.sdef
+--- mozilla.orig/mozilla/xpfe/bootstrap/appleevents/mozilla.sdef 2009-10-17 15:55:12.000000000 +0200
++++ mozilla/mozilla/xpfe/bootstrap/appleevents/mozilla.sdef 2009-10-24 13:36:13.000000000 +0200
+@@ -8,7 +8,7 @@
+ -->
+
+ <dictionary title="">
+- <suite name="SeaMonkey" code="MOZZ">
++ <suite name="Iceape" code="MOZZ">
+
+ </suite>
+
+diff -urN mozilla.orig/suite/app/application.ini mozilla/suite/app/application.ini
+--- mozilla.orig/suite/app/application.ini 2009-10-17 15:48:25.000000000 +0200
++++ mozilla/suite/app/application.ini 2009-10-24 13:36:13.000000000 +0200
+@@ -37,8 +37,8 @@
+
+ #filter substitution
+ [App]
+-Vendor=Mozilla
+-Name=SeaMonkey
++Vendor=
++Name=Iceape
+ Version=@APP_VERSION@
+ BuildID=@GRE_BUILDID@
+ #ifdef MOZ_SOURCE_REPO
+diff -urN mozilla.orig/suite/branding/Makefile.in mozilla/suite/branding/Makefile.in
+--- mozilla.orig/suite/branding/Makefile.in 2009-10-17 15:48:25.000000000 +0200
++++ mozilla/suite/branding/Makefile.in 2009-10-24 13:36:13.000000000 +0200
+@@ -91,13 +91,13 @@
+ endif
-@@ -17,4 +17,4 @@
+ ifeq ($(ICON_DIR),gtk)
+-libs:: icons/gtk/seamonkey.png
++libs:: icons/gtk/iceape.png
+ $(INSTALL) $^ $(DIST)/bin/chrome/icons/default
+
+-install:: icons/gtk/seamonkey.png
++install:: icons/gtk/iceape.png
+ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
+
+-GARBAGE += $(DIST)/bin/chrome/icons/default/seamonkey.png
++GARBAGE += $(DIST)/bin/chrome/icons/default/iceape.png
+
+ DESKTOP_ICONS += default
+ DESKTOP_ICONS_SMALL = $(patsubst %,%16,$(DESKTOP_ICONS))
+diff -urN mozilla.orig/suite/browser/browser-prefs.js mozilla/suite/browser/browser-prefs.js
+--- mozilla.orig/suite/browser/browser-prefs.js 2009-10-17 15:48:25.000000000 +0200
++++ mozilla/suite/browser/browser-prefs.js 2009-10-24 13:36:13.000000000 +0200
+@@ -472,12 +472,12 @@
+
+ // Preferences for the Get Add-ons pane
+ pref("extensions.getAddons.showPane", true);
+-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%");
++pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/seamonkey");
+ pref("extensions.getAddons.maxResults", 5);
+-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
++pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/recommended");
++pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
++pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search?q=%TERMS%");
++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
+
+ // Non-symmetric (not shared by extensions) extension-specific [update] preferences
+ pref("extensions.getMoreExtensionsURL", "chrome://branding/locale/brand.properties");
+diff -urN mozilla.orig/suite/build/nsSuiteModule.cpp mozilla/suite/build/nsSuiteModule.cpp
+--- mozilla.orig/suite/build/nsSuiteModule.cpp 2009-10-17 15:48:25.000000000 +0200
++++ mozilla/suite/build/nsSuiteModule.cpp 2009-10-24 13:36:13.000000000 +0200
+@@ -98,9 +98,9 @@
+ NS_PROFILEMIGRATOR_CONTRACTID,
+ nsProfileMigratorConstructor },
+
+- { "SeaMonkey Profile Migrator",
++ { "Iceape Profile Migrator",
+ NS_SEAMONKEYPROFILEMIGRATOR_CID,
+- NS_SUITEPROFILEMIGRATOR_CONTRACTID_PREFIX "seamonkey",
++ NS_SUITEPROFILEMIGRATOR_CONTRACTID_PREFIX "iceape",
+ nsSeamonkeyProfileMigratorConstructor },
+
+ { "Thunderbird Profile Migrator",
+diff -urN mozilla.orig/suite/common/src/nsSuiteGlue.js mozilla/suite/common/src/nsSuiteGlue.js
+--- mozilla.orig/suite/common/src/nsSuiteGlue.js 2009-10-17 15:48:26.000000000 +0200
++++ mozilla/suite/common/src/nsSuiteGlue.js 2009-10-24 13:36:13.000000000 +0200
+@@ -499,7 +499,7 @@
+
+
+ // for XPCOM
+- classDescription: "SeaMonkey Suite Glue Service",
++ classDescription: "Iceape Glue Service",
+ classID: Components.ID("{bbbbe845-5a1b-40ee-813c-f84b8faaa07c}"),
+ contractID: "@mozilla.org/suite/suiteglue;1",
+
+diff -urN mozilla.orig/suite/common/utilityOverlay.xul mozilla/suite/common/utilityOverlay.xul
+--- mozilla.orig/suite/common/utilityOverlay.xul 2009-10-17 15:48:26.000000000 +0200
++++ mozilla/suite/common/utilityOverlay.xul 2009-10-24 13:36:13.000000000 +0200
+@@ -358,11 +358,6 @@
+ key="key_openHelp"
+ command="cmd_openHelp"/>
- #config.js
- #
--startup.homepage_override_url=http://www.seamonkey-project.org/start/
-+startup.homepage_override_url=about:
-diff -urN mozilla.orig/xpfe/communicator/resources/content/utilityOverlay.xul mozilla/xpfe/communicator/resources/content/utilityOverlay.xul
---- mozilla.orig/xpfe/communicator/resources/content/utilityOverlay.xul 2008-07-29 13:32:16.000000000 +0200
-+++ mozilla/xpfe/communicator/resources/content/utilityOverlay.xul 2008-07-29 13:34:10.000000000 +0200
-@@ -286,11 +286,6 @@
- label="&helpMenu.label;"
- accesskey="&helpMenu.accesskey;">
- <menupopup id="helpPopup">
- <menuitem accesskey="&releaseCmd.accesskey;"
- label="&releaseCmd.label;"
- id="releaseUrl"
-- oncommand="openTopWin('&releaseURL;');"/>
+- oncommand="goReleaseNotes();"/>
-
- <menuseparator id="menu_HelpAboutSeparator"/>
+ <menuseparator id="menu_HelpUpdatesSeparator"/>
- <menuitem class="about"
-diff -urN mozilla.orig/xpfe/communicator/resources/locale/en-US/brand.dtd mozilla/xpfe/communicator/resources/locale/en-US/brand.dtd
---- mozilla.orig/xpfe/communicator/resources/locale/en-US/brand.dtd 2008-07-29 13:32:16.000000000 +0200
-+++ mozilla/xpfe/communicator/resources/locale/en-US/brand.dtd 2008-07-29 13:34:10.000000000 +0200
+ <menuitem accesskey="&updateCmd.accesskey;" label="&updateCmd.label;"
+diff -urN mozilla.orig/suite/confvars.sh mozilla/suite/confvars.sh
+--- mozilla.orig/suite/confvars.sh 2009-10-17 15:48:26.000000000 +0200
++++ mozilla/suite/confvars.sh 2009-10-24 13:36:13.000000000 +0200
+@@ -36,8 +36,8 @@
+ #
+ # ***** END LICENSE BLOCK *****
+
+-MOZ_APP_NAME=seamonkey
+-MOZ_APP_DISPLAYNAME=SeaMonkey
++MOZ_APP_NAME=iceape
++MOZ_APP_DISPLAYNAME=Iceape
+ MOZ_MAIL_NEWS=1
+ if [ "$COMM_BUILD" ]; then
+ MOZ_LDAP_XPCOM=1
+diff -urN mozilla.orig/suite/installer/unix/packages mozilla/suite/installer/unix/packages
+--- mozilla.orig/suite/installer/unix/packages 2009-10-17 15:48:26.000000000 +0200
++++ mozilla/suite/installer/unix/packages 2009-10-24 13:36:13.000000000 +0200
+@@ -365,7 +365,7 @@
+ bin/chrome/icons/default/main-window.png
+ bin/chrome/icons/default/main-window16.png
+ bin/chrome/icons/default/main-window48.png
+-bin/chrome/icons/default/seamonkey.png
++bin/chrome/icons/default/iceape.png
+ ; Although venkman-window is an extension, its icon is still suite-specific
+ bin/chrome/icons/default/venkman-window.png
+ bin/chrome/icons/default/venkman-window16.png
+diff -urN mozilla.orig/suite/locales/en-US/chrome/branding/brand.dtd mozilla/suite/locales/en-US/chrome/branding/brand.dtd
+--- mozilla.orig/suite/locales/en-US/chrome/branding/brand.dtd 2009-10-17 15:48:26.000000000 +0200
++++ mozilla/suite/locales/en-US/chrome/branding/brand.dtd 2009-10-24 13:36:13.000000000 +0200
@@ -1,5 +1,5 @@
- #expand <!ENTITY lang.version "__MOZILLA_LOCALE_VERSION__">
-<!ENTITY brandFullName "SeaMonkey">
-<!ENTITY brandShortName "SeaMonkey">
-<!ENTITY vendorShortName "SeaMonkey">
@@ -214,10 +191,11 @@
+<!ENTITY brandShortName "Iceape">
+<!ENTITY vendorShortName "Iceape">
<!ENTITY sidebarName "Sidebar">
-diff -urN mozilla.orig/xpfe/communicator/resources/locale/en-US/brand.properties mozilla/xpfe/communicator/resources/locale/en-US/brand.properties
---- mozilla.orig/xpfe/communicator/resources/locale/en-US/brand.properties 2008-07-29 13:32:16.000000000 +0200
-+++ mozilla/xpfe/communicator/resources/locale/en-US/brand.properties 2008-07-29 13:34:10.000000000 +0200
-@@ -1,4 +1,4 @@
+ <!ENTITY copyright.string "Copyright © 2003-2009 Contributors to the Mozilla project.">
+diff -urN mozilla.orig/suite/locales/en-US/chrome/branding/brand.properties mozilla/suite/locales/en-US/chrome/branding/brand.properties
+--- mozilla.orig/suite/locales/en-US/chrome/branding/brand.properties 2009-10-17 15:48:26.000000000 +0200
++++ mozilla/suite/locales/en-US/chrome/branding/brand.properties 2009-10-24 13:38:12.000000000 +0200
+@@ -1,11 +1,11 @@
-brandFullName=SeaMonkey
-brandShortName=SeaMonkey
-vendorShortName=SeaMonkey
@@ -225,35 +203,68 @@
+brandShortName=Iceape
+vendorShortName=Iceape
sidebarName=Sidebar
-diff -urN mozilla.orig/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
---- mozilla.orig/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul 2008-07-29 13:32:16.000000000 +0200
-+++ mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul 2008-07-29 13:34:10.000000000 +0200
-@@ -38,22 +38,6 @@
- </hbox>
- </groupbox>
-
-- <groupbox align="start">
-- <caption label="&updateNotifications.label;"/>
-- <description>&updateNotifications.desc;</description>
-- <checkbox id="updateNotificationsEnabled" label="&enableUN.label;"
-- accesskey="&enableUN.accesskey;" oncommand="toggleFrequency();"
-- prefstring="update_notifications.enabled"/>
-- <radiogroup id="updateFrequency" orient="horizontal"
-- prefstring="update_notifications.provider.0.frequency"
-- prefdefval="7">
-- <radio id="freqWeekly" label="&weekly.label;"
-- accesskey="&weekly.accesskey;" value="7"/>
-- <radio id="freqMonthly" label="&monthly.label;"
-- accesskey="&monthly.accesskey;" value="30"/>
-- </radiogroup>
-- </groupbox>
--
- <!--
- <groupbox align="start">
- <caption label="Installed Packages"/>
-diff -urN mozilla.orig/xpfe/components/search/resources/locale/en-US/default.htm mozilla/xpfe/components/search/resources/locale/en-US/default.htm
---- mozilla.orig/xpfe/components/search/resources/locale/en-US/default.htm 2008-07-29 13:32:16.000000000 +0200
-+++ mozilla/xpfe/components/search/resources/locale/en-US/default.htm 2008-07-29 13:34:10.000000000 +0200
+ extensions.getMoreLocalesURL=http://www.seamonkey-project.org/releases/#l10n
+-extensions.getMoreExtensionsURL=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/
+-extensions.getMoreThemesURL=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/
+-extensions.getMorePluginsURL=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/
+-spellchecker.dictionaries.download.url=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/dictionaries/
++extensions.getMoreExtensionsURL=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/seamonkey/%VERSION%/extensions/
++extensions.getMoreThemesURL=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/seamonkey/%VERSION%/themes/
++extensions.getMorePluginsURL=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/seamonkey/%VERSION%/plugins/
++spellchecker.dictionaries.download.url=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/seamonkey/%VERSION%/dictionaries/
+ app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
+-app.vendorURL=http://www.seamonkey-project.org/
++app.vendorURL=http://www.pld-linux.org/
+diff -urN mozilla.orig/suite/locales/en-US/chrome/browser/region.properties mozilla/suite/locales/en-US/chrome/browser/region.properties
+--- mozilla.orig/suite/locales/en-US/chrome/browser/region.properties 2009-10-17 15:48:26.000000000 +0200
++++ mozilla/suite/locales/en-US/chrome/browser/region.properties 2009-10-24 13:36:43.000000000 +0200
+@@ -4,8 +4,8 @@
+ #
+ # all.js
+ #
+-browser.startup.homepage=http://www.seamonkey-project.org/start/
+-browser.throbber.url=http://www.seamonkey-project.org/
++browser.startup.homepage=about:
++browser.throbber.url=http://www.pld-linux.org/Packages/Iceape
+ browser.search.defaulturl=http://www.google.com/search?q=
+
+ browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
+@@ -13,7 +13,7 @@
+
+ #config.js
+ #
+-startup.homepage_override_url=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
++startup.homepage_override_url=about:
+
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
+diff -urN mozilla.orig/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml mozilla/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
+--- mozilla.orig/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml 2009-10-17 15:48:26.000000000 +0200
++++ mozilla/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml 2009-10-24 13:36:13.000000000 +0200
+@@ -386,20 +386,6 @@
+ web sites in the current list.</li>
+ </ul>
+ </li>
+- <li><strong>Automatically check for updates to</strong>:
+- <ul>
+- <li><strong>&brandShortName;</strong>: Select this to be notified when
+- new versions of &brandShortName; are available. Your personal
+- information is not shared when verifying your version of
+- &brandShortName;. Choose whether you want &brandShortName; to do a
+- <strong>daily</strong> or a <strong>weekly</strong> check for new
+- versions.</li>
+- <li><strong>Installed add-ons</strong>: Select this to be notified when a
+- new version of one of your installed add-ons is available. Choose
+- whether you want &brandShortName; to do a <strong>daily</strong> or a
+- <strong>weekly</strong> check for new versions.</li>
+- </ul>
+- </li>
+ <li><strong>Add-on Manager</strong>: Click this to open the
+ Add-on Manager, where you can view and manage all your installed
+ extensions and themes.</li>
+diff -urN mozilla.orig/suite/locales/en-US/chrome/common/search/default.htm mozilla/suite/locales/en-US/chrome/common/search/default.htm
+--- mozilla.orig/suite/locales/en-US/chrome/common/search/default.htm 2009-10-17 15:48:27.000000000 +0200
++++ mozilla/suite/locales/en-US/chrome/common/search/default.htm 2009-10-24 13:36:13.000000000 +0200
@@ -6,7 +6,7 @@
</HEAD>
@@ -263,163 +274,85 @@
</BODY>
</HTML>
-diff -urN mozilla.orig/xpfe/global/jar.mn mozilla/xpfe/global/jar.mn
---- mozilla.orig/xpfe/global/jar.mn 2008-07-29 13:32:16.000000000 +0200
-+++ mozilla/xpfe/global/jar.mn 2008-07-29 13:34:10.000000000 +0200
-@@ -13,9 +13,9 @@
- content/global/commonDialog.js (resources/content/commonDialog.js)
- content/global/strres.js (resources/content/strres.js)
- #ifdef MOZ_SUITE
-- content/global/logo.gif (/suite/branding/content/logo.gif)
-+ content/global/logo.png (/suite/branding/content/logo.png)
- #else
-- content/global/logo.gif (resources/content/logo.gif)
-+ content/global/logo.png (resources/content/logo.png)
- #endif
- content/global/aboutAbout.html (resources/content/aboutAbout.html)
- content/global/about.xul (resources/content/about.xul)
-diff -urN mozilla.orig/xpfe/global/resources/content/about.xhtml mozilla/xpfe/global/resources/content/about.xhtml
---- mozilla.orig/xpfe/global/resources/content/about.xhtml 2008-07-29 13:32:16.000000000 +0200
-+++ mozilla/xpfe/global/resources/content/about.xhtml 2008-07-29 13:34:10.000000000 +0200
-@@ -50,79 +50,79 @@
- <head>
- <title>About:</title>
- <style type="text/css">
--table {
-- margin: auto;
-- text-align: center;
-+html {
-+ background: -moz-Dialog;
- }
-+
-+body {
-+ margin: 0;
-+ padding: 0 1em;
-+ color: -moz-FieldText;
-+ font: message-box;
-+}
-+
-+ #aboutPageContainer {
-+ position: relative;
-+ min-width: 330px;
-+ max-width: 50em;
-+ margin: 4em auto;
-+ border: 1px solid ThreeDShadow;
-+ -moz-border-radius: 10px;
-+ padding: 3em;
-+ -moz-padding-start: 30px;
-+ background: -moz-Field;
-+}
-+
-+ #aboutLogoContainer {
-+ border: 1px solid ThreeDLightShadow;
-+ width: 300px;
-+ margin-bottom: 2em;
-+}
-+
- img {
- border: 0;
- }
--p {
-- font-size: smaller;
-+
-+ #version {
-+ font-weight: bold;
-+ color: #909090;
-+ margin: -24px 0 9px 17px;
- }
--h1 {
-+
-+ul {
- margin: 0;
-+ -moz-margin-start: 1.5em;
-+ padding: 0;
-+ list-style: square;
- }
--:link {
-- color: #00e;
--}
--:visited {
-- color: #551a8b;
--}
--:link:active, :visited:active {
-- color: #f00;
-+
-+ul > li {
-+ margin-top: .5em;
- }
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceape/iceape-branding.patch?r1=1.7&r2=1.7.2.1&f=u
More information about the pld-cvs-commit
mailing list