Remove GIO HTTPS check again, it's not worth the trouble
Apparently lots of users cannot use Midori after this change and with no way to track down the cause of the issue, let's just not use this. The check was only for minimal gain anyway
This commit is contained in:
parent
a1e8f67a40
commit
be4038e555
3 changed files with 6 additions and 32 deletions
|
@ -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);
|
||||
|
|
|
@ -21,9 +21,6 @@
|
|||
#endif
|
||||
#include <string.h>
|
||||
|
||||
#if HAVE_GIO
|
||||
#include <gio/gio.h>
|
||||
#endif
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <glib/gprintf.h>
|
||||
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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__ */
|
||||
|
|
Loading…
Reference in a new issue