120 lines
4.9 KiB
Diff
120 lines
4.9 KiB
Diff
diff -urN epiphany-2.27.4/data/default-bookmarks.rdf.xml.in epiphany-2.27.4.patched//data/default-bookmarks.rdf.xml.in
|
|
--- epiphany-2.27.4/data/default-bookmarks.rdf.xml.in 1970-01-01 01:00:00.000000000 +0100
|
|
+++ epiphany-2.27.4.patched//data/default-bookmarks.rdf.xml.in 2009-07-20 22:32:43.000000000 +0200
|
|
@@ -0,0 +1,23 @@
|
|
+<?xml version="1.0"?>
|
|
+<rdf:RDF xmlns="http://purl.org/rss/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ephy="http://gnome.org/ns/epiphany#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
|
|
+ <channel rdf:about="file://@pkgdatadir@/bookmarks.rdf">
|
|
+ <title>Epiphany bookmarks</title>
|
|
+ <link>http://www.gnome.org/projects/epiphany/</link>
|
|
+ <items>
|
|
+ <rdf:Seq>
|
|
+ <rdf:li rdf:resource="http://www.google.com"/>
|
|
+ </rdf:Seq>
|
|
+ </items>
|
|
+ </channel>
|
|
+ <item rdf:about="http://www.google.com">
|
|
+ <_title>Search the web</_title>
|
|
+ <!-- Translators you should change these links to respect your locale.
|
|
+ For instance in .nl these should be
|
|
+ "http://www.google.nl" and "http://www.google.nl/search?q=%s" -->
|
|
+ <_link>http://www.google.com</_link>
|
|
+ <!-- Translators you should change these links to respect your locale.
|
|
+ For instance in .nl these should be
|
|
+ "http://www.google.nl" and "http://www.google.nl/search?q=%s" -->
|
|
+ <_ephy:smartlink>http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8</_ephy:smartlink>
|
|
+ </item>
|
|
+</rdf:RDF>
|
|
diff -urN epiphany-2.27.4/data/Makefile.am epiphany-2.27.4.patched//data/Makefile.am
|
|
--- epiphany-2.27.4/data/Makefile.am 2009-04-17 08:06:40.000000000 +0200
|
|
+++ epiphany-2.27.4.patched//data/Makefile.am 2009-07-20 22:39:09.000000000 +0200
|
|
@@ -42,6 +42,17 @@
|
|
$(service_DATA): $(service_in_files) Makefile
|
|
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
|
|
|
|
+# Default bookmarks
|
|
+# intltool hack: we name the file .xml.in so that intltool knows it's xml
|
|
+# format and can analyze it.
|
|
+# We don't put translations in the resulting rdf since the code can get
|
|
+# the translations via gettext (although it can also get translations
|
|
+# from the rdf if they are there and not available via gettext)
|
|
+default_bookmarksdir = $(pkgdatadir)
|
|
+default_bookmarks_in_files = default-bookmarks.rdf.xml.in
|
|
+default_bookmarks_DATA = $(default_bookmarks_in_files:.rdf.xml.in=.rdf)
|
|
+$(default_bookmarks_DATA): $(default_bookmarks_in_files) Makefile
|
|
+ @sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|;s|_title|title|g;s|_link|link|g;s|_ephy:smartlink|ephy:smartlink|g" $< > $@
|
|
|
|
install-data-local: $(schema_DATA)
|
|
if GCONF_SCHEMAS_INSTALL
|
|
@@ -63,6 +74,7 @@
|
|
$(xsl_DATA) \
|
|
$(service_DATA) \
|
|
$(m4data_DATA) \
|
|
+ $(default_bookmarks_in_files) \
|
|
epiphany-service.xml \
|
|
check-mime.py
|
|
|
|
@@ -70,4 +82,5 @@
|
|
$(service_DATA) \
|
|
$(schema_in_files:.schemas.in=.schemas) \
|
|
$(pkgconfig_DATA) \
|
|
- $(desktop_DATA)
|
|
+ $(desktop_DATA) \
|
|
+ $(default_bookmarks_DATA)
|
|
diff -urN epiphany-2.27.4/po/POTFILES.in epiphany-2.27.4.patched//po/POTFILES.in
|
|
--- epiphany-2.27.4/po/POTFILES.in 2009-06-05 23:42:54.000000000 +0200
|
|
+++ epiphany-2.27.4.patched//po/POTFILES.in 2009-07-20 22:32:43.000000000 +0200
|
|
@@ -2,6 +2,7 @@
|
|
# List of source files containing translatable strings.
|
|
# Please keep this file sorted alphabetically.
|
|
data/bme.desktop.in.in
|
|
+data/default-bookmarks.rdf.xml.in
|
|
data/epiphany.desktop.in.in
|
|
data/epiphany-lockdown.schemas.in
|
|
data/epiphany.schemas.in
|
|
diff -urN epiphany-2.27.4/src/bookmarks/ephy-bookmarks.c epiphany-2.27.4.patched//src/bookmarks/ephy-bookmarks.c
|
|
--- epiphany-2.27.4/src/bookmarks/ephy-bookmarks.c 2009-04-17 08:06:40.000000000 +0200
|
|
+++ epiphany-2.27.4.patched//src/bookmarks/ephy-bookmarks.c 2009-07-20 22:32:43.000000000 +0200
|
|
@@ -100,15 +100,6 @@
|
|
const char *location;
|
|
} EphyBookmarksBookmarkInfo;
|
|
|
|
-static const EphyBookmarksBookmarkInfo default_bookmarks [] =
|
|
-{
|
|
- /* Translators you should change these links to respect your locale.
|
|
- * For instance in .nl these should be
|
|
- * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
|
|
- */
|
|
- { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") }
|
|
-};
|
|
-
|
|
static const char *default_topics [] =
|
|
{
|
|
N_("Entertainment"),
|
|
@@ -152,13 +143,7 @@
|
|
ephy_bookmarks_add_keyword (eb, _(default_topics[i]));
|
|
}
|
|
|
|
- for (i = 0; i < G_N_ELEMENTS (default_bookmarks); i++)
|
|
- {
|
|
- EphyNode *bmk;
|
|
-
|
|
- bmk = ephy_bookmarks_add (eb, _(default_bookmarks[i].title),
|
|
- _(default_bookmarks[i].location));
|
|
- }
|
|
+ ephy_bookmarks_import_rdf (eb, DATADIR "/default-bookmarks.rdf");
|
|
}
|
|
|
|
static void
|
|
diff -urN epiphany-2.27.4/src/bookmarks/Makefile.am epiphany-2.27.4.patched//src/bookmarks/Makefile.am
|
|
--- epiphany-2.27.4/src/bookmarks/Makefile.am 2009-04-17 08:06:40.000000000 +0200
|
|
+++ epiphany-2.27.4.patched//src/bookmarks/Makefile.am 2009-07-20 22:32:43.000000000 +0200
|
|
@@ -111,6 +111,7 @@
|
|
-I$(top_srcdir)/embed \
|
|
-I$(top_srcdir)/lib/widgets \
|
|
-I$(top_srcdir)/lib/egg \
|
|
+ -DDATADIR=\""$(pkgdatadir)"\" \
|
|
$(AM_CPPFLAGS)
|
|
|
|
libephybookmarks_la_CFLAGS = \
|