debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix inconsistency in test initializations

Browse source
This commit is contained in:
Christian Dywan 2012-08-09 01:01:44 +02:00
parent e5da45a40e
commit 35dfebd1c6
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
midori/midori-browser.c
View file

@ -3688,6 +3688,9 @@ _action_caret_browsing_activate (GtkAction* action,
gint response; gint response;
GtkWidget* dialog; GtkWidget* dialog;
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
if (!katze_object_get_boolean (browser->settings, "enable-caret-browsing")) if (!katze_object_get_boolean (browser->settings, "enable-caret-browsing"))
{ {
dialog = gtk_message_dialog_new (GTK_WINDOW (browser), dialog = gtk_message_dialog_new (GTK_WINDOW (browser),

1
tests/bookmarks.c
View file

@ -195,6 +195,7 @@ main (int argc,
//TestParameters default_params = {":memory:", TRUE, NULL, NULL}; //TestParameters default_params = {":memory:", TRUE, NULL, NULL};
TestParameters default_params = {":memory:", FALSE, NULL, NULL}; TestParameters default_params = {":memory:", FALSE, NULL, NULL};
g_test_init (&argc, &argv, NULL);
midori_app_setup (&argc, &argv, NULL, NULL); midori_app_setup (&argc, &argv, NULL, NULL);
g_test_add ("/bookmarks/simple test", g_test_add ("/bookmarks/simple test",

5
tests/browser.c
View file

@ -130,11 +130,12 @@ int
main (int argc, main (int argc,
char** argv) char** argv)
{ {
g_object_set_data (G_OBJECT (webkit_get_default_session ()),
"midori-session-initialized", (void*)1);
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
midori_app_setup (&argc, &argv, NULL, NULL); midori_app_setup (&argc, &argv, NULL, NULL);
g_object_set_data (G_OBJECT (webkit_get_default_session ()),
"midori-session-initialized", (void*)1);
g_test_add_func ("/browser/create", browser_create); g_test_add_func ("/browser/create", browser_create);
g_test_add_func ("/browser/tooltips", browser_tooltips); g_test_add_func ("/browser/tooltips", browser_tooltips);
g_test_add_func ("/browser/site_data", browser_site_data); g_test_add_func ("/browser/site_data", browser_site_data);

5
tests/properties.c
View file

@ -187,11 +187,12 @@ int
main (int argc, main (int argc,
char** argv) char** argv)
{ {
g_object_set_data (G_OBJECT (webkit_get_default_session ()),
"midori-session-initialized", (void*)1);
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
midori_app_setup (&argc, &argv, NULL, NULL); midori_app_setup (&argc, &argv, NULL, NULL);
g_object_set_data (G_OBJECT (webkit_get_default_session ()),
"midori-session-initialized", (void*)1);
g_test_add_data_func ("/properties/app", g_test_add_data_func ("/properties/app",
(gconstpointer)MIDORI_TYPE_APP, properties_type_test); (gconstpointer)MIDORI_TYPE_APP, properties_type_test);
g_test_add_data_func ("/properties/browser", g_test_add_data_func ("/properties/browser",