diff options
| author | Vincent Untz <vuntz@gnome.org> | 2009-07-30 18:51:48 +0800 |
|---|---|---|
| committer | Vincent Untz <vuntz@gnome.org> | 2009-07-30 18:51:48 +0800 |
| commit | 72b49fe58f5feaa36ae4851415a76588793f1510 (patch) | |
| tree | 388029e647659e812421247453a6298f2876ad29 /src/bookmarks | |
| parent | 048b02780261819c29de2b43a1c1a18d3cbb066f (diff) | |
| download | gsoc2013-epiphany-72b49fe58f5feaa36ae4851415a76588793f1510.tar.gz gsoc2013-epiphany-72b49fe58f5feaa36ae4851415a76588793f1510.tar.zst gsoc2013-epiphany-72b49fe58f5feaa36ae4851415a76588793f1510.zip | |
Move default bookmarks to separate rdf file instead of hard-coded values
Bug #300190
Diffstat (limited to 'src/bookmarks')
| -rw-r--r-- | src/bookmarks/Makefile.am | 1 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks.c | 23 |
2 files changed, 2 insertions, 22 deletions
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am index bf87823dd..52664459b 100644 --- a/src/bookmarks/Makefile.am +++ b/src/bookmarks/Makefile.am @@ -111,6 +111,7 @@ libephybookmarks_la_CPPFLAGS = \ -I$(top_srcdir)/embed \ -I$(top_srcdir)/lib/widgets \ -I$(top_srcdir)/lib/egg \ + -DDATADIR=\""$(pkgdatadir)"\" \ $(AM_CPPFLAGS) libephybookmarks_la_CFLAGS = \ diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index c8f06d226..81137c757 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -94,21 +94,6 @@ struct _EphyBookmarksPrivate #endif }; -typedef struct -{ - const char *title; - 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 +137,7 @@ ephy_bookmarks_init_defaults (EphyBookmarks *eb) 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 |