diff options
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | midori/midori-searchaction.h | 3 | ||||
| -rw-r--r-- | midori/midori-view.h | 4 | ||||
| -rw-r--r-- | tests/actions.vala | 10 |
4 files changed, 27 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 28225ad4..e03834c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,7 +255,19 @@ else () endif () # Explicitly add -fPIC for older toolchains -set(VALA_CFLAGS "-w -g -fPIC") +set(VALA_CFLAGS "-g -fPIC") + +# With compiler versions that can, enable exactly the non-spurious warnings +# in Vala-generated C, otherwise disable warnings +if ((CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "5.0.0") + OR (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "3.0.0")) + set(VALA_CFLAGS "${VALA_CFLAGS} -Werror=implicit-function-declaration") + set(VALA_CFLAGS "${VALA_CFLAGS} -Wno-incompatible-pointer-types") + set(VALA_CFLAGS "${VALA_CFLAGS} -Wno-discarded-qualifiers") + set(VALA_CFLAGS "${VALA_CFLAGS} -Wno-deprecated-declarations") +else () + set(VALA_CFLAGS "${VALA_CFLAGS} -w") +endif () set(LIBMIDORI "${CMAKE_PROJECT_NAME}-core") diff --git a/midori/midori-searchaction.h b/midori/midori-searchaction.h index 5c050b37..56ab9cb4 100644 --- a/midori/midori-searchaction.h +++ b/midori/midori-searchaction.h @@ -63,6 +63,9 @@ void midori_search_action_set_default_item (MidoriSearchAction* search_action, KatzeItem* item); +gchar* +midori_search_action_token_for_uri (const gchar* uri); + GtkWidget* midori_search_action_get_dialog (MidoriSearchAction* search_action); diff --git a/midori/midori-view.h b/midori/midori-view.h index c885100b..1cc5e8c3 100644 --- a/midori/midori-view.h +++ b/midori/midori-view.h @@ -259,6 +259,10 @@ midori_view_get_tls_info (MidoriView* view, GTlsCertificateFlags* tls_flags, gchar** hostname); +MidoriContextAction* +midori_view_get_page_context_action (MidoriView* view, + WebKitHitTestResult* hit_test_result); + G_END_DECLS #endif /* __MIDORI_VIEW_H__ */ diff --git a/tests/actions.vala b/tests/actions.vala index b44c891c..90ae8f62 100644 --- a/tests/actions.vala +++ b/tests/actions.vala @@ -20,13 +20,17 @@ void actions_view_page () { var hit_test_result = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.DOCUMENT) as WebKit.HitTestResult; var menu = view.get_page_context_action (hit_test_result); + assert (menu != null); assert (menu.name == "PageContextMenu"); assert (menu.get_by_name ("Back") != null); #if !HAVE_WEBKIT2 - hit_test_result = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.EDITABLE) as WebKit.HitTestResult; - menu = view.get_page_context_action (hit_test_result); - var copy = menu.get_by_name ("Copy"); + var hit_test_result2 = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.EDITABLE) as WebKit.HitTestResult; + var menu2 = view.get_page_context_action (hit_test_result2); + assert (menu2 != null); + assert (menu2.name == "PageContextMenu"); + var copy = menu2.get_by_name ("Copy"); + assert (copy != null); assert (!copy.sensitive); assert (view.web_view.search_text ("flat", true, false, false)); menu = view.get_page_context_action (hit_test_result); |