diff options
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/ephy-embed-shell.c | 5 | ||||
| -rw-r--r-- | embed/ephy-favicon-cache.c | 2 | ||||
| -rw-r--r-- | embed/ephy-history.c | 25 | ||||
| -rw-r--r-- | embed/mozilla/BaseProtocolContentHandler.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/StartHereProtocolHandler.cpp | 6 |
5 files changed, 23 insertions, 17 deletions
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index 9db8e2db6..e4ca5bb73 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -21,8 +21,8 @@ #include "ephy-embed-shell.h" #include "ephy-marshal.h" #include "ephy-favicon-cache.h" - #include "mozilla-embed-shell.h" +#include "ephy-debug.h" #include <string.h> @@ -155,11 +155,13 @@ ephy_embed_shell_finalize (GObject *object) g_return_if_fail (ges->priv != NULL); + LOG ("Unref history") if (ges->priv->global_history) { g_object_unref (ges->priv->global_history); } + LOG ("Unref downloader") if (ges->priv->downloader_view) { g_object_remove_weak_pointer @@ -168,6 +170,7 @@ ephy_embed_shell_finalize (GObject *object) g_object_unref (ges->priv->downloader_view); } + LOG ("Unref favicon cache") if (ges->priv->favicon_cache) { g_object_unref (G_OBJECT (ges->priv->favicon_cache)); diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c index 3c34913d5..eae812691 100644 --- a/embed/ephy-favicon-cache.c +++ b/embed/ephy-favicon-cache.c @@ -335,6 +335,8 @@ ephy_favicon_cache_finalize (GObject *object) { EphyFaviconCache *cache; + LOG ("Finalize favicon cache") + g_return_if_fail (object != NULL); g_return_if_fail (EPHY_IS_FAVICON_CACHE (object)); diff --git a/embed/ephy-history.c b/embed/ephy-history.c index da304ed6e..f818ceb21 100644 --- a/embed/ephy-history.c +++ b/embed/ephy-history.c @@ -500,6 +500,8 @@ ephy_history_host_visited (EphyHistory *eh, GValue value = { 0, }; int visits; + LOG ("Host visited") + visits = ephy_node_get_property_int (host, EPHY_NODE_PAGE_PROP_VISITS); if (visits < 0) visits = 0; @@ -762,20 +764,21 @@ ephy_history_set_page_title (EphyHistory *gh, { EphyNode *node; guint host_id; + GValue value = { 0, }; + + LOG ("Set page title") node = ephy_history_get_page (gh, url); - if (node) - { - GValue value = { 0, }; + if (!node) return; - g_value_init (&value, G_TYPE_STRING); - g_value_set_string (&value, title); - ephy_node_set_property - (node, EPHY_NODE_PAGE_PROP_TITLE, &value); - g_value_unset (&value); - } + g_value_init (&value, G_TYPE_STRING); + g_value_set_string (&value, title); + ephy_node_set_property + (node, EPHY_NODE_PAGE_PROP_TITLE, &value); + g_value_unset (&value); - host_id = ephy_node_get_property_int (node, EPHY_NODE_PAGE_PROP_HOST_ID); + host_id = ephy_node_get_property_int + (node, EPHY_NODE_PAGE_PROP_HOST_ID); if (host_id >= 0) { ephy_history_host_set_title (gh, ephy_node_get_from_id (host_id), @@ -828,6 +831,8 @@ ephy_history_remove (EphyHistory *gh, EphyNode *node) EphyNode *host; int host_id; + LOG ("Remove history item") + host_id = ephy_node_get_property_int (node, EPHY_NODE_PAGE_PROP_HOST_ID); if (host_id < 0) { diff --git a/embed/mozilla/BaseProtocolContentHandler.cpp b/embed/mozilla/BaseProtocolContentHandler.cpp index 741d21722..d381d0b17 100644 --- a/embed/mozilla/BaseProtocolContentHandler.cpp +++ b/embed/mozilla/BaseProtocolContentHandler.cpp @@ -64,7 +64,7 @@ NS_IMETHODIMP GBaseProtocolContentHandler::NewChannel(nsIURI *aURI, nsCOMPtr<nsIChannel> channel; rv = NS_NewInputStreamChannel(getter_AddRefs(channel), aURI, - iStream, mMimeType, NS_LITERAL_CSTRING(""), 0); + iStream, mMimeType, NS_LITERAL_CSTRING("")); if (NS_FAILED(rv)) return rv; NS_IF_ADDREF (*_retval = channel); diff --git a/embed/mozilla/StartHereProtocolHandler.cpp b/embed/mozilla/StartHereProtocolHandler.cpp index a4548378d..369b9123d 100644 --- a/embed/mozilla/StartHereProtocolHandler.cpp +++ b/embed/mozilla/StartHereProtocolHandler.cpp @@ -160,17 +160,13 @@ NS_IMETHODIMP GStartHereProtocolHandler::NewChannel(nsIURI *aURI, if (NS_FAILED (rv)) return NS_ERROR_FAILURE; nsCOMPtr<nsIInputStream> iStream; - PRUint32 size; - - rv = sStream->GetLength(&size); - if (NS_FAILED(rv)) return rv; rv = sStream->NewInputStream(0, getter_AddRefs(iStream)); if (NS_FAILED(rv)) return rv; rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), uri, iStream, NS_LITERAL_CSTRING("text/xml"), - NS_LITERAL_CSTRING("utf-8"), size); + NS_LITERAL_CSTRING("utf-8")); g_free (buf); g_object_unref (sh); |