diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 29f7e649..7965fd73 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -258,8 +258,9 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "ZoomOut", web_view != NULL); _action_set_sensitive (browser, "ZoomNormal", web_view != NULL && webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) != 1.0); - if (sokoke_gio_supports_http ()) - _action_set_sensitive (browser, "SourceView", web_view != NULL); + #if HAVE_GIO + _action_set_sensitive (browser, "SourceView", web_view != NULL); + #endif _action_set_sensitive (browser, "FindNext", web_view != NULL); _action_set_sensitive (browser, "FindPrevious", web_view != NULL); /* _action_set_sensitive (browser, "FindQuick", web_view != NULL); */ @@ -3606,7 +3607,9 @@ midori_browser_init (MidoriBrowser* browser) g_object_unref (ui_manager); - _action_set_sensitive (browser, "SourceView", sokoke_gio_supports_http ()); + #if !HAVE_GIO + _action_set_sensitive (browser, "SourceView", FALSE); + #endif #ifndef WEBKIT_CHECK_VERSION _action_set_sensitive (browser, "ZoomIn", FALSE); diff --git a/midori/sokoke.c b/midori/sokoke.c index d97079b1..8affd5dd 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -21,9 +21,6 @@ #endif #include -#if HAVE_GIO - #include -#endif #include #include #include @@ -629,26 +626,3 @@ sokoke_action_create_popup_menu_item (GtkAction* action) return menuitem; } - -gboolean -sokoke_gio_supports_http (void) -{ - #if HAVE_GIO - static gboolean supports_http; - static gboolean tested; - const gchar* const* schemes = g_vfs_get_supported_uri_schemes (g_vfs_get_default ()); - - if (tested) - return supports_http; - while (*schemes) - { - if (!strcmp (*schemes, "http")) - supports_http = TRUE; - schemes++; - } - tested = TRUE; - return supports_http; - #else - return FALSE; - #endif -} diff --git a/midori/sokoke.h b/midori/sokoke.h index a74c80ce..59f8ea87 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -131,7 +131,4 @@ sokoke_object_get_boolean (gpointer object, GtkWidget* sokoke_action_create_popup_menu_item (GtkAction* action); -gboolean -sokoke_gio_supports_http (void ); - #endif /* !__SOKOKE_H__ */