summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-03-15 19:18:05 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-03-15 19:18:24 -0300
commit822c98711aa59af023de44f5ef765b9591c67c92 (patch)
treefcccab45146a29a043e0b7eae6b50f49e0b4aa35
parent7bdfb5ac0279d538c6fe33ee04abe852eb7740ea (diff)
Minor fix in Branding.patch
-rw-r--r--patches/iceape-branding/Branding.patch44
1 files changed, 32 insertions, 12 deletions
diff --git a/patches/iceape-branding/Branding.patch b/patches/iceape-branding/Branding.patch
index 1c98485..2e726b6 100644
--- a/patches/iceape-branding/Branding.patch
+++ b/patches/iceape-branding/Branding.patch
@@ -1,3 +1,16 @@
+diff --git a/suite/branding/nightly/moz.build b/suite/branding/nightly/moz.build
+index ccd2e60..dfad066 100644
+--- a/suite/branding/nightly/moz.build
++++ b/suite/branding/nightly/moz.build
+@@ -53,7 +53,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
+
+ if icon_dir == 'gtk':
+ FINAL_TARGET_FILES.chrome.icons.default += [
+- 'icons/gtk/seamonkey.png'
++ 'icons/gtk/iceape.png'
+ ]
+
+ desktop_icons += [
diff --git a/suite/browser/browser-prefs.js b/suite/browser/browser-prefs.js
index ee2803b..f87dff8 100644
--- a/suite/browser/browser-prefs.js
@@ -30,6 +43,25 @@ index ee2803b..f87dff8 100644
// getMoreThemes is used by our UI under our switch theme menu
pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
+diff --git a/suite/confvars.sh b/suite/confvars.sh
+index c44cc95..988131d 100755
+--- a/suite/confvars.sh
++++ b/suite/confvars.sh
+@@ -3,10 +3,10 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-MOZ_APP_BASENAME=SeaMonkey
+-MOZ_APP_VENDOR=Mozilla
+-MOZ_APP_NAME=seamonkey
+-MOZ_APP_DISPLAYNAME=SeaMonkey
++MOZ_APP_BASENAME=Iceape
++MOZ_APP_VENDOR=SeaMonkey Council
++MOZ_APP_NAME=iceape
++MOZ_APP_DISPLAYNAME=Iceape
+ MOZ_LDAP_XPCOM=1
+ MOZ_CHROME_FILE_FORMAT=omni
+ MOZ_COMPOSER=1
diff --git a/suite/locales/en-US/chrome/branding/brand.dtd b/suite/locales/en-US/chrome/branding/brand.dtd
index f9cd0b1..061e3f4 100644
--- a/suite/locales/en-US/chrome/branding/brand.dtd
@@ -69,18 +101,6 @@ index 3263135..71904cc 100644
+extensions.getPersonasURL=
+app.releaseNotesURL=
+app.vendorURL=
-diff --git a/suite/moz.build b/suite/moz.build
-index 6d69b00..d9ee84e 100644
---- a/suite/moz.build
-+++ b/suite/moz.build
-@@ -10,6 +10,7 @@ if 'pre' in CONFIG['MOZ_APP_VERSION'] or 'a' in CONFIG['MOZ_APP_VERSION']:
- DIRS += ['debugQA']
-
- DIRS += [
-+ 'branding/nightly' ,
- 'browser',
- 'common',
- 'feeds/public',
diff --git a/suite/themes/classic/install.rdf b/suite/themes/classic/install.rdf
index 58d0ecc..95f4c86 100644
--- a/suite/themes/classic/install.rdf