aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorClaudio Saavedra <csaavedra@igalia.com>2012-03-13 17:02:09 +0800
committerClaudio Saavedra <csaavedra@igalia.com>2012-03-13 18:33:41 +0800
commit637e046e0666576c71d1efa116d8148450b35db6 (patch)
treef83df81046290bbe1cb314bcde95ef2899e21289 /embed
parentf4ed0fb98f033727eb22f62ddb3ba60424c8cc91 (diff)
downloadgsoc2013-epiphany-637e046e0666576c71d1efa116d8148450b35db6.tar
gsoc2013-epiphany-637e046e0666576c71d1efa116d8148450b35db6.tar.gz
gsoc2013-epiphany-637e046e0666576c71d1efa116d8148450b35db6.tar.bz2
gsoc2013-epiphany-637e046e0666576c71d1efa116d8148450b35db6.tar.lz
gsoc2013-epiphany-637e046e0666576c71d1efa116d8148450b35db6.tar.xz
gsoc2013-epiphany-637e046e0666576c71d1efa116d8148450b35db6.tar.zst
gsoc2013-epiphany-637e046e0666576c71d1efa116d8148450b35db6.zip
ephy-history-service: make the async API cancellable
The main purpose of the cancellable API in ephy-history-service is to let the user notify when the results of the operation are no longer needed and the callback call can be omitted. Since performing a read operation, in such cases, makes no sense, we cancel them altogether. However, given the nature of the service, we don't cancel write operations. https://bugzilla.gnome.org/show_bug.cgi?id=671901
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed.c4
-rw-r--r--embed/ephy-web-view.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index a58e83f50..1c7505798 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -267,7 +267,7 @@ restore_zoom_level (EphyEmbed *embed,
/* restore zoom level */
if (ephy_embed_utils_address_has_web_scheme (address)) {
ephy_history_service_get_host_for_url (embed->priv->history_service,
- address,
+ address, NULL,
(EphyHistoryJobCallback)get_host_for_url_cb, embed);
}
}
@@ -365,7 +365,7 @@ zoom_changed_cb (WebKitWebView *web_view,
if (ephy_embed_utils_address_has_web_scheme (address)) {
ephy_history_service_set_url_zoom_level (embed->priv->history_service,
address, zoom,
- NULL, NULL);
+ NULL, NULL, NULL);
}
g_free (address);
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 2295e6974..5951dc2cf 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1084,7 +1084,7 @@ title_changed_cb (WebKitWebView *web_view,
ephy_web_view_set_title (EPHY_WEB_VIEW (web_view), title);
if (uri && title)
- ephy_history_service_set_url_title (history, uri, title, NULL, NULL);
+ ephy_history_service_set_url_title (history, uri, title, NULL, NULL, NULL);
g_free (title);