[epiphany] Fix download tests in WK2
- From: Xan Lopez <xan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Fix download tests in WK2
- Date: Tue, 12 Mar 2013 18:20:21 +0000 (UTC)
commit 3e7587c89c40f8031d64f126aec0c53bf47f0634
Author: Manuel Rego Casasnovas <rego igalia com>
Date: Tue Mar 12 17:41:27 2013 +0100
Fix download tests in WK2
Modify ephy_download_dispose to disconnect WebKitDownload from all the handlers.
https://bugzilla.gnome.org/show_bug.cgi?id=694579
embed/ephy-download.c | 1 +
tests/ephy-download-test.c | 4 ----
2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/embed/ephy-download.c b/embed/ephy-download.c
index 4457482..df27b6e 100644
--- a/embed/ephy-download.c
+++ b/embed/ephy-download.c
@@ -677,6 +677,7 @@ ephy_download_dispose (GObject *object)
priv = download->priv;
if (priv->download) {
+ g_signal_handlers_disconnect_matched (priv->download, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, download);
g_object_unref (priv->download);
priv->download = NULL;
}
diff --git a/tests/ephy-download-test.c b/tests/ephy-download-test.c
index 7c92184..d2b9863 100644
--- a/tests/ephy-download-test.c
+++ b/tests/ephy-download-test.c
@@ -145,7 +145,6 @@ test_ephy_download_new_for_uri (Fixture *fixture, gconstpointer data)
ephy_download_get_source_uri (fixture->download));
}
-#ifndef HAVE_WEBKIT2
static void
test_ephy_download_start (Fixture *fixture, gconstpointer data)
{
@@ -155,7 +154,6 @@ test_ephy_download_start (Fixture *fixture, gconstpointer data)
ephy_download_start (fixture->download);
g_main_loop_run (fixture->loop);
}
-#endif
int
main (int argc, char *argv[])
@@ -190,11 +188,9 @@ main (int argc, char *argv[])
g_test_add ("/embed/ephy-download/new_for_uri",
Fixture, NULL, fixture_setup,
test_ephy_download_new_for_uri, fixture_teardown);
-#ifndef HAVE_WEBKIT2
g_test_add ("/embed/ephy-download/start",
Fixture, NULL, fixture_setup,
test_ephy_download_start, fixture_teardown);
-#endif
ret = g_test_run ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]