From 575b6689b13b85b58551eaee386015725cd5b82b Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard
Date: Fri, 20 Jun 2008 22:18:37 +0000
Subject: Merge branch 'upstream-git' into upstream
Conflicts (merged manually):
tests/test-web-view.py
---
(limited to 'data')
diff --git a/data/Makefile.am b/data/Makefile.am
index 98d9b33..83b35fd 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = chrome
+
hulahopdir = $(pkgdatadir)
hulahop_DATA = prefs.js
diff --git a/data/chrome/.gitignore b/data/chrome/.gitignore
new file mode 100644
index 0000000..c590bcb
--- /dev/null
+++ b/data/chrome/.gitignore
@@ -0,0 +1 @@
+chrome.manifest
diff --git a/data/chrome/Makefile.am b/data/chrome/Makefile.am
new file mode 100644
index 0000000..d319915
--- /dev/null
+++ b/data/chrome/Makefile.am
@@ -0,0 +1,25 @@
+manifestdir = $(pkgdatadir)/chrome
+manifest_in_files = chrome.manifest.in
+manifest_DATA = $(manifest_in_files:.manifest.in=.manifest)
+
+%.manifest: %.manifest.in
+ @sed -e "s!@CHROMEDIR@!$(pkgdatadir)/chrome!g" $< > $@
+
+brandingdir = $(manifestdir)/branding
+branding_DATA = brand.properties
+
+globalchromedir = $(manifestdir)/global
+globalchrome_DATA = netError.dtd
+
+EXTRA_DIST = \
+ $(manifest_in_files) \
+ $(branding_in_files) \
+ $(globalchrome_DATA) \
+ $(branding_DATA)
+
+CLEANFILES = \
+ $(manifest_DATA)
+
+DISTCLEANFILES = \
+ $(manifest_DATA) \
+ $(branding_DATA)
diff --git a/data/chrome/brand.properties b/data/chrome/brand.properties
new file mode 100644
index 0000000..48b6083
--- /dev/null
+++ b/data/chrome/brand.properties
@@ -0,0 +1 @@
+brandShortName=Hulahop
diff --git a/data/chrome/chrome.manifest.in b/data/chrome/chrome.manifest.in
new file mode 100644
index 0000000..eba0ee0
--- /dev/null
+++ b/data/chrome/chrome.manifest.in
@@ -0,0 +1,2 @@
+override chrome://branding/locale/brand.properties file://@CHROMEDIR@/branding/brand.properties
+override chrome://global/locale/netErrorApp.dtd file://@CHROMEDIR@/global/netError.dtd
diff --git a/data/chrome/netError.dtd b/data/chrome/netError.dtd
new file mode 100644
index 0000000..82fe3b1
--- /dev/null
+++ b/data/chrome/netError.dtd
@@ -0,0 +1,9 @@
+
+
+
+
+You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.
+
+
+">
--
cgit v0.9.1