diff options
Diffstat (limited to 'midori')
| -rw-r--r-- | midori/midori-app.c | 13 | ||||
| -rw-r--r-- | midori/midori-window.vala | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/midori/midori-app.c b/midori/midori-app.c index 15b0a470..a4c71df5 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -1223,6 +1223,19 @@ midori_app_setup (gint *argc, /* Preserve argument vector */ midori_paths_init_exec_path (*argument_vector, *argc); + #ifdef G_OS_WIN32 + { + gchar* exec_dir = g_win32_get_package_installation_directory_of_module (NULL); + gchar* dr_mingw_dll = g_build_filename (exec_dir, "bin", "exchndl.dll", NULL); + + if (g_file_test (dr_mingw_dll, G_FILE_TEST_EXISTS)) { + LoadLibrary(dr_mingw_dll); + } + g_free (exec_dir); + g_free (dr_mingw_dll); + } + #endif + #if ENABLE_NLS if (g_getenv ("MIDORI_NLSPATH")) bindtextdomain (GETTEXT_PACKAGE, g_getenv ("MIDORI_NLSPATH")); diff --git a/midori/midori-window.vala b/midori/midori-window.vala index b1732565..b4fbacdf 100644 --- a/midori/midori-window.vala +++ b/midori/midori-window.vala @@ -201,7 +201,7 @@ namespace Midori { } public void add_toolbar (Gtk.Widget toolbar) { - var _toolbar = (Gtk.Toolbar)toolbar; + var _toolbar = toolbar as Gtk.Toolbar; if (_toolbar != null) { #if HAVE_GTK3 get_style_context ().add_class ("secondary-toolbar"); |