Merge lp:~midori/midori/win32-enable-profiles into lp:midori

[Paweł Forysiuk]

Enable browser profiles on win32 as the work sans auto update

[Cris Dywan (kalikiana)]

Looks sensible - but let's remember to investigate the refreshing issue.

review: Approve

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2015-04-18 20:04:40 +0000
+++ extensions/apps.vala	2015-08-30 10:55:27 +0000
@@ -205,8 +205,6 @@
             if (toolbar == null) {
                 toolbar = new Gtk.Toolbar ();
 
-#if !HAVE_WIN32
-                /* FIXME: Profiles are broken on win32 because of no multi instance support */
                 var profile = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
                 profile.label = _("New _Profile");
                 profile.tooltip_text = _("Creates a new, independent profile and a launcher");
@@ -217,7 +215,6 @@
                     Launcher.create_profile.begin (this);
                 });
                 toolbar.insert (profile, -1);
-#endif
 
                 var app = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
                 app.label = _("New _App");
@@ -480,11 +477,8 @@
             monitors = new GLib.List<GLib.FileMonitor> ();
             app_folder = Launcher.get_app_folder ();
             populate_apps.begin (app_folder);
-            /* FIXME: Profiles are broken on win32 because of no multi instance support */
             profile_folder = Launcher.get_profile_folder ();
-#if !HAVE_WIN32
             populate_apps.begin (profile_folder);
-#endif
             widgets = new GLib.List<Gtk.Widget> ();
             foreach (var browser in app.get_browsers ())
                 browser_added (browser);