Merge lp:~kalikiana/midori/apple into lp:midori

[Cris Dywan]

Read apps/ profiles from folder, leave launchers separate

Read apps/ profiles from folder, leave launchers separate

[Cris Dywan (kalikiana)]

Need to fix monitoring after the refactoring and ignore the error if the app/ profile folder exists, desc should still be created if -a was used on its own.

review: Needs Fixing

[Paweł Forysiuk (tuxator)]

regarding profiles and win32

it seems to refuse to parse Exec line if there is a backslash there,
so
midori -c c:\dir\other\dir\md5sum
needs to be
midori -c c:\\dir\\other\\dir\\md5sum

Fixing this makes launcher for profile appear on the panel at least

from launching from cli -c arg needs to be double quoted instead it would just run into first
space in the path and thinks it is the whole path
so
midori -c c:\\Documents and Settings\\user
will be launched as

midori -c C:\\Documents

But even with quotes in exec line in desktop file it does not seem to launch properly
about:paths show regular version paths and it just shows google - like in launch where
no existing config is found

additionally i get following error on the cli

** (midori4:1524): WARNING **: fd_recv(): failed with 10054 (errno = 0)

Adding paths to files when showing warings should not hurt as well.

[Cris Dywan (kalikiana)]

review: Abstain

[lp:~kalikiana/midori/apple]

6205. By Paweł Forysiuk on 2013-06-29

Implement deleting default launcher on win32

[Paweł Forysiuk (tuxator)]

I did not check this before but unfortunately adding monitors seems to kill midori ;/
Also there is a problem when there is unicode title it will create launcher but desktop file will not
be parsed so it will not show in the panel, this seems to come from name and i think it is the same
issue as with completion and such.

I implemented deleting default lnk file but we need to sort out crasher and codepage stuff.

review: Needs Fixing

[Cris Dywan (kalikiana)]

Is it possible that SHGetFolderPath returns a local encoding such as ISO-8859-1? How about using g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP) instead?

I haven't seen a crash due to monitoring, a backtrace would be useful.

[Paweł Forysiuk (tuxator)]

no crash when using glib function but monitoring does not seem to work, i need to restart midori

[lp:~kalikiana/midori/apple]

6206. By Paweł Forysiuk on 2013-07-03

Use glib funtion to get destkop folder on win32

6207. By Paweł Forysiuk on 2013-07-04

Check if file exists before removing lnk file

6208. By Paweł Forysiuk on 2013-07-04

Don't needlessly recompute filename from launcher title

[Cris Dywan (kalikiana)]

Please review to get this into trunk and simply file the last Win32 quirks as bugs (monitoring and unicode handling).

[Paweł Forysiuk (tuxator)]

Looks fine so far

review: Approve

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2013-06-21 23:18:01 +0000
+++ extensions/apps.vala	2013-07-04 20:20:33 +0000
@@ -22,11 +22,41 @@
 
         internal static async void create (string prefix, GLib.File folder, string uri, string title, Gtk.Widget proxy) {
             /* Strip LRE leading character and / */
-            string exec = prefix + uri;
             string name = title.delimit ("‪/", ' ').strip();
-            string filename = Midori.Download.clean_filename (name) + ".desktop";
-            // TODO: Midori.Paths.get_icon save to png
+            string filename = Midori.Download.clean_filename (name);
+            string exec;
+#if HAVE_WIN32
+            string doubleslash_uri = uri.replace ("\\", "\\\\");
+            string quoted_uri = GLib.Shell.quote (doubleslash_uri);
+            exec = prefix + quoted_uri;
+#else
+            exec = prefix + uri;
+#endif
+            try {
+                folder.make_directory_with_parents (null);
+            }
+            catch (Error error) {
+                /* It's not an error if the folder already exists;
+                   any fatal problems will fail further down the line */
+            }
+
             string icon_name = Midori.Stock.WEB_BROWSER;
+            try {
+                var pixbuf = Midori.Paths.get_icon (uri, null);
+                if (pixbuf == null)
+                    throw new FileError.EXIST ("No favicon loaded");
+                string icon_filename = folder.get_child ("icon.png").get_path ();
+                pixbuf.save (icon_filename, "png", null, "compression", "7", null);
+#if HAVE_WIN32
+                string doubleslash_icon = icon_filename.replace ("\\", "\\\\");
+                icon_name = doubleslash_icon;
+#else
+                icon_name = icon_filename;
+#endif
+            }
+            catch (Error error) {
+                GLib.warning (_("Failed to fetch application icon in %s: %s"), folder.get_path (), error.message);
+            }
             string contents = """
                 [Desktop Entry]
                 Version=1.0
@@ -37,16 +67,25 @@
                 Icon=%s
                 Categories=Network;
                 """.printf (name, exec, PACKAGE_NAME, icon_name);
-            var file = folder.get_child (filename);
+            var file = folder.get_child ("desc");
             var browser = proxy.get_toplevel () as Midori.Browser;
             try {
                 var stream = yield file.replace_async (null, false, GLib.FileCreateFlags.NONE);
                 yield stream.write_async (contents.data);
+                // Create a launcher/ menu
+#if HAVE_WIN32
+                Midori.Sokoke.create_win32_desktop_lnk (prefix, filename, uri);
+#else
+                var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ());
+                yield file.copy_async (data_dir.get_child ("applications").get_child (filename + ".desktop"),
+                    GLib.FileCopyFlags.NONE);
+#endif
 
                 browser.send_notification (_("Launcher created"),
                     _("You can now run <b>%s</b> from your launcher or menu").printf (name));
             }
             catch (Error error) {
+                warning (_("Failed to create new launcher: %s").printf (error.message));
                 browser.send_notification (_("Error creating launcher"),
                     _("Failed to create new launcher: %s").printf (error.message));
             }
@@ -57,11 +96,9 @@
         }
 
         bool init (GLib.Cancellable? cancellable) throws GLib.Error {
-            if (!file.get_basename ().has_suffix (".desktop"))
-                return false;
-
             var keyfile = new GLib.KeyFile ();
-            keyfile.load_from_file (file.get_path (), GLib.KeyFileFlags.NONE);
+            keyfile.load_from_file (file.get_child ("desc").get_path (), GLib.KeyFileFlags.NONE);
+
             exec = keyfile.get_string ("Desktop Entry", "Exec");
             if (!exec.has_prefix (APP_PREFIX) && !exec.has_prefix (PROFILE_PREFIX))
                 return false;
@@ -79,6 +116,7 @@
         Gtk.TreeView treeview;
         Katze.Array array;
         GLib.File app_folder;
+        GLib.File profile_folder;
 
         public unowned string get_stock_id () {
             return Midori.Stock.WEB_BROWSER;
@@ -102,7 +140,7 @@
                     string uuid = g_dbus_generate_guid ();
                     string config = Path.build_path (Path.DIR_SEPARATOR_S,
                         Midori.Paths.get_user_data_dir (), PACKAGE_NAME, "profiles", uuid);
-                    Launcher.create.begin (PROFILE_PREFIX, app_folder,
+                    Launcher.create.begin (PROFILE_PREFIX, profile_folder.get_child (uuid),
                         config, _("Midori (%s)").printf (uuid), this);
                 });
                 toolbar.insert (profile, -1);
@@ -115,7 +153,8 @@
                 app.show ();
                 app.clicked.connect (() => {
                     var view = (get_toplevel () as Midori.Browser).tab as Midori.View;
-                    Launcher.create.begin (APP_PREFIX, app_folder,
+                    string checksum = Checksum.compute_for_string (ChecksumType.MD5, view.get_display_uri (), -1);
+                    Launcher.create.begin (APP_PREFIX, app_folder.get_child (checksum),
                         view.get_display_uri (), view.get_display_title (), this);
                 });
                 toolbar.insert (app, -1);
@@ -151,6 +190,18 @@
                             try {
                                 launcher.file.trash (null);
                                 store.remove (iter);
+
+                                string filename = Midori.Download.clean_filename (launcher.name);
+#if HAVE_WIN32
+                                string lnk_filename = Midori.Sokoke.get_win32_desktop_lnk_path_for_filename (filename);
+                                if (Posix.access (lnk_filename, Posix.F_OK) == 0) {
+                                    var lnk_file = File.new_for_path (lnk_filename);
+                                    lnk_file.trash ();
+                                }
+#else
+                                var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ());
+                                data_dir.get_child ("applications").get_child (filename + ".desktop").trash ();
+#endif
                             }
                             catch (Error error) {
                                 GLib.critical (error.message);
@@ -163,7 +214,7 @@
             return false;
         }
 
-        public Sidebar (Katze.Array array, GLib.File app_folder) {
+        public Sidebar (Katze.Array array, GLib.File app_folder, GLib.File profile_folder) {
             Gtk.TreeViewColumn column;
 
             treeview = new Gtk.TreeView.with_model (store);
@@ -204,6 +255,7 @@
                 launcher_added (item);
 
             this.app_folder = app_folder;
+            this.profile_folder = profile_folder;
         }
 
         private int tree_sort_func (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b) {
@@ -228,11 +280,18 @@
 
             Launcher launcher;
             model.get (iter, 0, out launcher);
-            if (launcher.icon_name != null)
+
+            try {
+                int icon_width = 48, icon_height = 48;
+                Gtk.icon_size_lookup_for_settings (get_settings (),
+                    Gtk.IconSize.DIALOG, out icon_width, out icon_height);
+                var pixbuf = new Gdk.Pixbuf.from_file_at_size (launcher.icon_name, icon_width, icon_height);
+                renderer.set ("pixbuf", pixbuf);
+            }
+            catch (Error error) {
                 renderer.set ("icon-name", launcher.icon_name);
-            else
-                renderer.set ("stock-id", Gtk.STOCK_FILE);
-            renderer.set ("stock-size", Gtk.IconSize.BUTTON,
+            }
+            renderer.set ("stock-size", Gtk.IconSize.DIALOG,
                           "xpad", 4);
         }
 
@@ -258,7 +317,8 @@
     private class Manager : Midori.Extension {
         internal Katze.Array array;
         internal GLib.File app_folder;
-        internal GLib.FileMonitor? monitor;
+        internal GLib.File profile_folder;
+        internal GLib.List<GLib.FileMonitor> monitors;
         internal GLib.List<Gtk.Widget> widgets;
 
         void app_changed (GLib.File file, GLib.File? other, GLib.FileMonitorEvent event) {
@@ -282,9 +342,7 @@
             }
         }
 
-        async void populate_apps () {
-            var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ());
-            app_folder = data_dir.get_child ("applications");
+        async void populate_apps (File app_folder) {
             try {
                 try {
                     app_folder.make_directory_with_parents (null);
@@ -294,8 +352,9 @@
                         throw folder_error;
                 }
 
-                monitor = app_folder.monitor_directory (0, null);
+                var monitor = app_folder.monitor_directory (0, null);
                 monitor.changed.connect (app_changed);
+                monitors.append (monitor);
 
                 var enumerator = yield app_folder.enumerate_children_async ("standard::name", 0);
                 while (true) {
@@ -303,9 +362,9 @@
                     if (files == null)
                         break;
                     foreach (var info in files) {
-                        var desktop_file = app_folder.get_child (info.get_name ());
+                        var file = app_folder.get_child (info.get_name ());
                         try {
-                            var launcher = new Launcher (desktop_file);
+                            var launcher = new Launcher (file);
                             if (launcher.init ())
                                 array.add_item (launcher);
                         }
@@ -316,8 +375,7 @@
                 }
             }
             catch (Error io_error) {
-                monitor = null;
-                warning ("Failed to list .desktop files (%s): %s",
+                warning ("Failed to list apps (%s): %s",
                          app_folder.get_path (), io_error.message);
             }
         }
@@ -328,13 +386,14 @@
             menu.append (menuitem);
             menuitem.activate.connect (() => {
                 var view = browser.tab as Midori.View;
-                Launcher.create.begin (APP_PREFIX, app_folder,
+                string checksum = Checksum.compute_for_string (ChecksumType.MD5, view.get_display_uri (), -1);
+                Launcher.create.begin (APP_PREFIX, app_folder.get_child (checksum),
                     view.get_display_uri (), view.get_display_title (), browser);
             });
         }
 
         void browser_added (Midori.Browser browser) {
-            var viewable = new Sidebar (array, app_folder);
+            var viewable = new Sidebar (array, app_folder, profile_folder);
             viewable.show ();
             browser.panel.append_page (viewable);
             browser.populate_tool_menu.connect (tool_menu_populated);
@@ -344,7 +403,12 @@
 
         void activated (Midori.App app) {
             array = new Katze.Array (typeof (Launcher));
-            populate_apps.begin ();
+            var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ()).get_child (PACKAGE_NAME);
+            monitors = new GLib.List<GLib.FileMonitor> ();
+            app_folder = data_dir.get_child ("apps");
+            populate_apps.begin (app_folder);
+            profile_folder = data_dir.get_child ("profiles");
+            populate_apps.begin (profile_folder);
             widgets = new GLib.List<Gtk.Widget> ();
             foreach (var browser in app.get_browsers ())
                 browser_added (browser);
@@ -353,8 +417,10 @@
 
         void deactivated () {
             var app = get_app ();
-            if (monitor != null)
+            foreach (var monitor in monitors)
                 monitor.changed.disconnect (app_changed);
+            monitors = null;
+
             app.add_browser.disconnect (browser_added);
             foreach (var widget in widgets)
                 widget.destroy ();

=== modified file 'katze/katze-item.c'
--- katze/katze-item.c	2013-06-25 16:26:37 +0000
+++ katze/katze-item.c	2013-07-04 20:20:33 +0000
@@ -447,8 +447,6 @@
 
     if (widget && KATZE_ITEM_IS_FOLDER (item))
         return gtk_widget_render_icon (widget, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL);
-    if ((pixbuf = midori_paths_get_icon (katze_item_get_icon (item), NULL)))
-        return pixbuf;
     if ((pixbuf = midori_paths_get_icon (item->uri, widget)))
         return pixbuf;
     return NULL;

=== modified file 'katze/midori-paths.vala'
--- katze/midori-paths.vala	2013-06-26 21:54:50 +0000
+++ katze/midori-paths.vala	2013-07-04 20:20:33 +0000
@@ -424,6 +424,8 @@
             if (widget != null)
                 Gtk.icon_size_lookup_for_settings (widget.get_settings (),
                     Gtk.IconSize.MENU, out icon_width, out icon_height);
+            else
+                icon_width = icon_height = 0 /* maximum size */;
 #if HAVE_WEBKIT2
             /* TODO async
             var database = WebKit.WebContext.get_default ().get_favicon_database ();

=== modified file 'midori/midori-completion.vala'
--- midori/midori-completion.vala	2013-05-19 09:43:05 +0000
+++ midori/midori-completion.vala	2013-07-04 20:20:33 +0000
@@ -52,6 +52,7 @@
             MARKUP,
             BACKGROUND,
             YALIGN,
+            SIZE,
             N
         }
 
@@ -60,8 +61,8 @@
             completions = new List<Completion> ();
             next_position = 0;
             model = new Gtk.ListStore (Columns.N,
-                typeof (Gdk.Pixbuf), typeof (string), typeof (string),
-                typeof (string), typeof (float));
+                typeof (GLib.Icon), typeof (string), typeof (string),
+                typeof (string), typeof (float), typeof (uint));
         }
 
         public void add (Completion completion) {
@@ -78,6 +79,17 @@
             return false;
         }
 
+        private GLib.Icon? scale_if_needed (GLib.Icon? icon) {
+            if (icon is Gdk.Pixbuf) {
+                var pixbuf = icon as Gdk.Pixbuf;
+                int icon_width = 16, icon_height = 16;
+                Gtk.icon_size_lookup (Gtk.IconSize.MENU, out icon_width, out icon_height);
+                if (pixbuf.width > icon_width || pixbuf.height > icon_height)
+                    return pixbuf.scale_simple (icon_width, icon_height, Gdk.InterpType.BILINEAR);
+            }
+            return icon;
+        }
+
         private void fill_model (Midori.Completion completion, List<Midori.Suggestion>? suggestions) {
             if (need_to_clear) {
                 model.clear ();
@@ -91,6 +103,7 @@
                     Columns.URI, "about:completion-description",
                     Columns.MARKUP, "<b>%s</b>\n".printf (Markup.escape_text (completion.description)),
                     Columns.ICON, null,
+                    Columns.SIZE, Gtk.IconSize.MENU,
                     Columns.BACKGROUND, null,
                     Columns.YALIGN, 0.25);
             }
@@ -110,7 +123,8 @@
                     Columns.URI, suggestion.uri,
                     Columns.MARKUP, suggestion.use_markup
                     ? suggestion.markup : Markup.escape_text (suggestion.markup),
-                    Columns.ICON, suggestion.icon,
+                    Columns.ICON, scale_if_needed (suggestion.icon),
+                    Columns.SIZE, Gtk.IconSize.MENU,
                     Columns.BACKGROUND, suggestion.background,
                     Columns.YALIGN, 0.25);
 

=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2013-06-21 20:49:53 +0000
+++ midori/midori-locationaction.c	2013-07-04 20:20:33 +0000
@@ -714,7 +714,8 @@
         renderer = gtk_cell_renderer_pixbuf_new ();
         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), renderer, FALSE);
         gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer,
-            "pixbuf", MIDORI_AUTOCOMPLETER_COLUMNS_ICON,
+            "gicon", MIDORI_AUTOCOMPLETER_COLUMNS_ICON,
+            "stock-size", MIDORI_AUTOCOMPLETER_COLUMNS_SIZE,
             "yalign", MIDORI_AUTOCOMPLETER_COLUMNS_YALIGN,
             "cell-background", MIDORI_AUTOCOMPLETER_COLUMNS_BACKGROUND,
             NULL);

=== modified file 'midori/midori-searchcompletion.vala'
--- midori/midori-searchcompletion.vala	2013-05-19 09:43:05 +0000
+++ midori/midori-searchcompletion.vala	2013-07-04 20:20:33 +0000
@@ -39,16 +39,13 @@
             var suggestions = new List<Suggestion> ();
             uint n = 0;
             foreach (var item in items) {
-                string icon, uri, title, desc;
-                item.get ("icon", out icon);
+                string uri, title, desc;
                 item.get ("uri", out uri);
                 item.get ("name", out title);
                 item.get ("text", out desc);
                 string search_uri = URI.for_search (uri, text);
                 string search_title = _("Search with %s").printf (title);
-                Gdk.Pixbuf? pixbuf = Midori.Paths.get_icon (icon, null);
-                if (pixbuf == null)
-                    pixbuf = Midori.Paths.get_icon (uri, null);
+                Gdk.Pixbuf? pixbuf = Midori.Paths.get_icon (uri, null);
                 string search_desc = search_title + "\n" + desc ?? uri;
                 /* FIXME: Theming? Win32? */
                 string background = "gray";

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-05-28 20:02:29 +0000
+++ midori/midori.vapi	2013-07-04 20:20:33 +0000
@@ -252,6 +252,10 @@
     [CCode (cheader_filename = "midori/sokoke.h", lower_case_cprefix = "sokoke_")]
     namespace Sokoke {
         public static uint gtk_action_count_modifiers (Gtk.Action action);
+    #if HAVE_WIN32
+        public static string get_win32_desktop_lnk_path_for_filename (string filename);
+        public static void create_win32_desktop_lnk (string prefix, string filename, string uri);
+    #endif
     }
 }
 

=== modified file 'midori/sokoke.c'
--- midori/sokoke.c	2013-06-26 21:54:50 +0000
+++ midori/sokoke.c	2013-07-04 20:20:33 +0000
@@ -34,6 +34,11 @@
 #include <glib/gstdio.h>
 #include "katze/katze.h"
 
+#ifdef G_OS_WIN32
+#include <windows.h>
+#include <shlobj.h>
+#endif
+
 static gchar*
 sokoke_js_string_utf8 (JSStringRef js_string)
 {
@@ -1116,3 +1121,65 @@
     return entry;
 }
 
+#ifdef G_OS_WIN32
+gchar*
+sokoke_get_win32_desktop_lnk_path_for_filename (gchar* filename)
+{
+    const gchar* desktop_dir;
+    gchar* lnk_path, *lnk_file;
+
+    /* CSIDL_PROGRAMS for "start menu -> programs" instead - needs saner/shorter filename */
+    desktop_dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
+
+    lnk_file = g_strconcat (filename, ".lnk", NULL);
+    lnk_path = g_build_filename (desktop_dir, lnk_file, NULL);
+
+    g_free (lnk_file);
+
+    return lnk_path;
+}
+
+void
+sokoke_create_win32_desktop_lnk (gchar* prefix, gchar* filename, gchar* uri)
+{
+    WCHAR w[MAX_PATH];
+
+    gchar* exec_dir, *exec_path, *argument;
+    gchar* lnk_path, *launcher_type;
+
+    IShellLink* pShellLink;
+    IPersistFile* pPersistFile;
+
+    exec_dir = g_win32_get_package_installation_directory_of_module (NULL);
+    exec_path = g_build_filename (exec_dir, "bin", "midori.exe", NULL);
+
+    if (g_str_has_suffix (prefix, " -a "))
+        launcher_type = "-a";
+    else if (g_str_has_suffix (prefix, " -c "))
+        launcher_type = "-c";
+
+    argument = g_strdup_printf ("%s \"%s\"", launcher_type, uri);
+
+    /* Create link */
+    CoCreateInstance (&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLink, (LPVOID *)&pShellLink);
+    pShellLink->lpVtbl->SetPath (pShellLink, exec_path);
+    pShellLink->lpVtbl->SetArguments (pShellLink, argument);
+    /* TODO: support adding site favicon as webapp icon */
+    /* pShellLink->lpVtbl->SetIconLocation (pShellLink, icon_path, icon_index); */
+
+    /* Save link */
+    lnk_path = sokoke_get_win32_desktop_lnk_path_for_filename (filename);
+    pShellLink->lpVtbl->QueryInterface (pShellLink, &IID_IPersistFile, (LPVOID *)&pPersistFile);
+    MultiByteToWideChar (CP_UTF8, 0, lnk_path, -1, w, MAX_PATH);
+    pPersistFile->lpVtbl->Save (pPersistFile, w, TRUE);
+
+    pPersistFile->lpVtbl->Release (pPersistFile);
+    pShellLink->lpVtbl->Release (pShellLink);
+
+    g_free (exec_dir);
+    g_free (exec_path);
+    g_free (argument);
+    g_free (lnk_path);
+    g_free (launcher_type);
+}
+#endif

=== modified file 'midori/sokoke.h'
--- midori/sokoke.h	2013-04-11 20:38:19 +0000
+++ midori/sokoke.h	2013-07-04 20:20:33 +0000
@@ -128,4 +128,12 @@
 GtkWidget*
 sokoke_search_entry_new               (const gchar*        placeholder_text);
 
+#ifdef G_OS_WIN32
+gchar*
+sokoke_get_win32_desktop_lnk_path_for_filename (gchar* filename);
+
+void
+sokoke_create_win32_desktop_lnk (gchar* prefix, gchar* filename, gchar* uri);
+#endif
+
 #endif /* !__SOKOKE_H__ */

=== modified file 'midori/wscript_build'
--- midori/wscript_build	2013-05-14 17:52:15 +0000
+++ midori/wscript_build	2013-07-04 20:20:33 +0000
@@ -9,7 +9,7 @@
 progressive = True
 libs = 'M UNIQUE LIBSOUP GMODULE GTHREAD LIBIDN GIO GTK SQLITE ' \
        'LIBNOTIFY WEBKIT JAVASCRIPTCOREGTK LIBXML X11 XSS WS2_32 ' \
-       'GCR GRANITE ZEITGEIST'
+       'GCR GRANITE ZEITGEIST OLE32 UUID '
 
 if Options.commands['build'] or Options.commands['check']:
     blddir = str (bld.bldnode)[6:] # dir:// + absolute path

=== modified file 'wscript'
--- wscript	2013-06-30 14:37:38 +0000
+++ wscript	2013-07-04 20:20:33 +0000
@@ -309,6 +309,8 @@
         conf.check (function_name='inet_addr', header_name='sys/types.h sys/socket.h netinet/in.h arpa/inet.h')
     conf.define ('HAVE_OSX', int(sys.platform == 'darwin'))
     if Options.platform == 'win32':
+        conf.check (lib='ole32')
+        conf.check (lib='uuid')
         conf.env.append_value ('LINKFLAGS', '-mwindows')
         conf.env.append_value ('program_LINKFLAGS', ['-Wl,--out-implib=default/midori/libmidori.a', '-Wl,--export-all-symbols'])
     else: