diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | data/epiphany.schemas.in | 2 | ||||
| -rw-r--r-- | data/starthere/index.xml.in | 6 | ||||
| -rw-r--r-- | data/starthere/section.xsl | 3 | ||||
| -rw-r--r-- | data/starthere/smartbookmarks.xml.in | 6 | ||||
| -rw-r--r-- | embed/mozilla/StartHereProtocolHandler.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/StartHereProtocolHandler.h | 2 | ||||
| -rw-r--r-- | lib/ephy-node.c | 2 |
8 files changed, 26 insertions, 12 deletions
@@ -1,3 +1,18 @@ +2003-04-14 Marco Pesenti Gritti <marco@it.gnome.org> + + * data/epiphany.schemas.in: + * data/starthere/index.xml.in: + * data/starthere/section.xsl: + * data/starthere/smartbookmarks.xml.in: + * embed/mozilla/StartHereProtocolHandler.cpp: + * embed/mozilla/StartHereProtocolHandler.h: + + Use home:, have titles. + + * lib/ephy-node.c: (ephy_node_get_from_id): + + Do not assert on 0 id. It's valid. + 2003-04-14 David Bordoley <bordoley@msu.edu> * src/bookmarks/ephy-bookmark-properties.c: diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in index c19b400f4..6e2d1fb19 100644 --- a/data/epiphany.schemas.in +++ b/data/epiphany.schemas.in @@ -5,7 +5,7 @@ <applyto>/apps/epiphany/general/start_page</applyto> <owner>epiphany</owner> <type>string</type> - <default>start-here:</default> + <default>home:</default> <locale name="C"> <short>Home page</short> <long>URL for the user's home page. Displayed on start up diff --git a/data/starthere/index.xml.in b/data/starthere/index.xml.in index bce23e123..22b1588ed 100644 --- a/data/starthere/index.xml.in +++ b/data/starthere/index.xml.in @@ -1,9 +1,9 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="section.xsl"?> -<section> +<section name="Home"> <bar> -<item section="start-here:">Start Here</item> -<item section="start-here:smartbookmarks">Smart Bookmarks</item> +<item section="home:">Home</item> +<item section="home:smartbookmarks">Smart Bookmarks</item> </bar> <_title>The web browser</_title> <_paragraph> diff --git a/data/starthere/section.xsl b/data/starthere/section.xsl index b7c6377ee..eb552e0aa 100644 --- a/data/starthere/section.xsl +++ b/data/starthere/section.xsl @@ -10,6 +10,7 @@ <xsl:template match="section"> <html> <head> + <title><xsl:value-of select="@name"/></title> <style type="text/css"> body { margin-left: 150; @@ -93,7 +94,7 @@ </xsl:template> <xsl:template match="action"> -<a href="start-here:{@id}?{@param}"> +<a href="home:{@id}?{@param}"> <xsl:apply-templates/> </a><br/> </xsl:template> diff --git a/data/starthere/smartbookmarks.xml.in b/data/starthere/smartbookmarks.xml.in index 3362efd65..be6fbc5d3 100644 --- a/data/starthere/smartbookmarks.xml.in +++ b/data/starthere/smartbookmarks.xml.in @@ -1,9 +1,9 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="section.xsl"?> -<section> +<section name="Smart Bookmarks"> <bar> -<item section="start-here:">Start Here</item> -<item section="start-here:smartbookmarks">Smart Bookmarks</item> +<item section="home:">Home</item> +<item section="home:smartbookmarks">Smart Bookmarks</item> </bar> <content> <_title>Smart Bookmarks</_title> diff --git a/embed/mozilla/StartHereProtocolHandler.cpp b/embed/mozilla/StartHereProtocolHandler.cpp index 987415435..4d2c52c7d 100644 --- a/embed/mozilla/StartHereProtocolHandler.cpp +++ b/embed/mozilla/StartHereProtocolHandler.cpp @@ -49,7 +49,7 @@ GStartHereProtocolHandler::~GStartHereProtocolHandler() /* readonly attribute string scheme; */ NS_IMETHODIMP GStartHereProtocolHandler::GetScheme(nsACString &aScheme) { - aScheme = NS_LITERAL_CSTRING("start-here"); + aScheme = NS_LITERAL_CSTRING("home"); return NS_OK; } diff --git a/embed/mozilla/StartHereProtocolHandler.h b/embed/mozilla/StartHereProtocolHandler.h index ea18ee39d..ab8744523 100644 --- a/embed/mozilla/StartHereProtocolHandler.h +++ b/embed/mozilla/StartHereProtocolHandler.h @@ -31,7 +31,7 @@ 0x431d, \ {0x87, 0xe6, 0x3b, 0xef, 0x8e, 0x7a, 0xda, 0x51} \ } -#define G_START_HERE_PROTOCOLHANDLER_CONTRACTID NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "start-here" +#define G_START_HERE_PROTOCOLHANDLER_CONTRACTID NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "home" #define G_START_HERE_PROTOCOLHANDLER_CLASSNAME "Epiphany's start here protocol handler" class GStartHereProtocolHandler : public nsIProtocolHandler diff --git a/lib/ephy-node.c b/lib/ephy-node.c index 44ae48c2e..f3283cc88 100644 --- a/lib/ephy-node.c +++ b/lib/ephy-node.c @@ -438,8 +438,6 @@ ephy_node_get_from_id (gulong id) { EphyNode *ret = NULL; - g_return_val_if_fail (id > 0, NULL); - g_static_rw_lock_reader_lock (id_to_node_lock); ret = node_from_id_real (id); |