diff options
| author | Claudio Saavedra <csaavedra@igalia.com> | 2012-03-13 17:02:09 +0800 |
|---|---|---|
| committer | Claudio Saavedra <csaavedra@igalia.com> | 2012-03-13 18:33:41 +0800 |
| commit | 637e046e0666576c71d1efa116d8148450b35db6 (patch) | |
| tree | f83df81046290bbe1cb314bcde95ef2899e21289 /src | |
| parent | f4ed0fb98f033727eb22f62ddb3ba60424c8cc91 (diff) | |
| download | gsoc2013-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 'src')
| -rw-r--r-- | src/ephy-completion-model.c | 2 | ||||
| -rw-r--r-- | src/ephy-history-window.c | 10 | ||||
| -rw-r--r-- | src/pdm-dialog.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c index ea60c2a26..e3f25bda5 100644 --- a/src/ephy-completion-model.c +++ b/src/ephy-completion-model.c @@ -491,7 +491,7 @@ ephy_completion_model_update_for_string (EphyCompletionModel *model, ephy_history_service_find_urls (priv->history_service, 0, 0, MAX_COMPLETION_HISTORY_URLS, 0, - query, + query, NULL, (EphyHistoryJobCallback)query_completed_cb, user_data); } diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index 0601278c6..5ddb0cb2e 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -203,7 +203,7 @@ confirmation_dialog_response_cb (GtkWidget *dialog, if (response == GTK_RESPONSE_ACCEPT) { ephy_history_service_clear (editor->priv->history_service, - NULL, NULL); + NULL, NULL, NULL); filter_now (editor, TRUE, TRUE); } } @@ -461,13 +461,13 @@ cmd_delete (GtkAction *action, { GList *selected; selected = ephy_urls_view_get_selection (EPHY_URLS_VIEW (editor->priv->pages_view)); - ephy_history_service_delete_urls (editor->priv->history_service, selected, + ephy_history_service_delete_urls (editor->priv->history_service, selected, NULL, (EphyHistoryJobCallback)on_browse_history_deleted_cb, editor); } else if (gtk_widget_is_focus (editor->priv->hosts_view)) { EphyHistoryHost *host = get_selected_host (editor); if (host) { ephy_history_service_delete_host (editor->priv->history_service, - host, + host, NULL, (EphyHistoryJobCallback)on_host_deleted_cb, editor); ephy_history_host_free (host); @@ -1076,7 +1076,7 @@ filter_now (EphyHistoryWindow *editor, if (hosts) { ephy_history_service_find_hosts (editor->priv->history_service, - from, to, + from, to, NULL, (EphyHistoryJobCallback) on_get_hosts_cb, editor); } @@ -1086,7 +1086,7 @@ filter_now (EphyHistoryWindow *editor, ephy_history_service_find_urls (editor->priv->history_service, from, to, 0, host ? host->id : 0, - substrings, + substrings, NULL, (EphyHistoryJobCallback)on_find_urls_cb, editor); ephy_history_host_free (host); } diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index 9a06c4ff4..4f0139e6d 100644 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -256,7 +256,7 @@ clear_all_dialog_response_cb (GtkDialog *dialog, shell = ephy_embed_shell_get_default (); history = EPHY_HISTORY_SERVICE (ephy_embed_shell_get_global_history_service (shell)); - ephy_history_service_clear (history, NULL, NULL); + ephy_history_service_clear (history, NULL, NULL, NULL); } if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_cookies))) |