From 03b146386eeed99e60eeb21d7b4d4b018e64592d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 16 Jan 2011 14:04:11 +0100 Subject: [PATCH] Don't test PrivateBrowsing and AddDesktopShortcut --- panels/midori-history.c | 2 +- tests/browser.c | 4 +++- tests/properties.c | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index 1f953190..f8f432bb 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -459,7 +459,7 @@ midori_history_set_app (MidoriHistory* history, gtk_tree_store_clear (GTK_TREE_STORE (model)); } - katze_assign (history->app, app); + katze_object_assign (history->app, app); if (!app) return; g_object_ref (app); diff --git a/tests/browser.c b/tests/browser.c index 6af1210b..db815d2f 100644 --- a/tests/browser.c +++ b/tests/browser.c @@ -39,7 +39,9 @@ browser_create (void) if (g_strcmp0 (gtk_action_get_name (action), "WindowClose")) if (g_strcmp0 (gtk_action_get_name (action), "EncodingCustom")) if (g_strcmp0 (gtk_action_get_name (action), "AddSpeedDial")) - gtk_action_activate (action); + if (g_strcmp0 (gtk_action_get_name (action), "PrivateBrowsing")) + if (g_strcmp0 (gtk_action_get_name (action), "AddDesktopShortcut")) + gtk_action_activate (action); actions = g_list_next (actions); } g_list_free (actions); diff --git a/tests/properties.c b/tests/properties.c index 6de616c3..315a92e9 100644 --- a/tests/properties.c +++ b/tests/properties.c @@ -133,11 +133,14 @@ properties_object_get_set (GObject* object) G_PARAM_SPEC_ENUM (pspec)->default_value, NULL); for (k = enum_class->minimum; k < enum_class->maximum; k++) { - GEnumValue* enum_value = g_enum_get_value (enum_class, k); + GEnumValue* enum_value; + GEnumValue* enum_value_; + + enum_value = g_enum_get_value (enum_class, k); if (!enum_value) g_error ("%s.%s has no value %d", G_OBJECT_TYPE_NAME (object), property, k); - GEnumValue* enum_value_ = g_enum_get_value_by_name (enum_class, + enum_value_ = g_enum_get_value_by_name (enum_class, enum_value->value_name); if (!enum_value) g_error ("%s.%s has no value '%s'", -- 2.39.5