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

[Paweł Forysiuk]

win32: Hide gui for profiles in webapp manager, as they are currently broken on Windows

[Cris Dywan (kalikiana)]

Looks sensible. Linux still works as before.

review: Approve

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2013-08-08 22:13:35 +0000
+++ extensions/apps.vala	2013-08-09 22:51:39 +0000
@@ -130,6 +130,8 @@
             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, independant profile and a launcher");
@@ -144,6 +146,7 @@
                         config, _("Midori (%s)").printf (uuid), this);
                 });
                 toolbar.insert (profile, -1);
+#endif
 
                 var app = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
                 app.label = _("New _App");
@@ -409,8 +412,11 @@
             monitors = new GLib.List<GLib.FileMonitor> ();
             app_folder = data_dir.get_child ("apps");
             populate_apps.begin (app_folder);
+            /* FIXME: Profiles are broken on win32 because of no multi instance support */
             profile_folder = data_dir.get_child ("profiles");
+#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);