Merge lp:~midori/midori/appz into lp:midori

[Paweł Forysiuk]

Enhance webapps handling

DONE:
Re-enable profiles on win

TODO:
- renaming of profiles/webapps

- non utf8 names
    leaves us with brorken desktop files - example russian articles on wikipedia, youtube "playing" char

- escaping
   we should escape backslashes in paths and percents in url (backslashes could be refactored from win32 code)

- allow to have multiple "profiles" of webapp from the same host
   for example different acconunts on webmail

- use favicons in lnk files on win32
   (there was a problem of missing api on win xp iirc, we can conditionally enable it in the worst case)

[lp:~midori/midori/appz]

6552. By Paweł Forysiuk on 2014-01-28

Escape backslash for exec field unconditionally

Unmerged revisions

6552. By Paweł Forysiuk on 2014-01-28

Escape backslash for exec field unconditionally

6551. By Paweł Forysiuk on 2014-01-28

Re-enable profiles on win after porting to GApp

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2014-01-25 21:34:30 +0000
+++ extensions/apps.vala	2014-01-28 13:28:53 +0000
@@ -49,16 +49,19 @@
             return icon_name;
         }
 
+        internal static string desktop_file_sanitize_uri (string uri)
+        {
+            string escaped_backslash_uri = uri.replace ("\\", "\\\\");
+
+            return GLib.Shell.quote (escaped_backslash_uri);
+        }
+
         internal static string prepare_desktop_file (string prefix, string name, string uri, string title, string icon_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
+            string sanitized_uri = desktop_file_sanitize_uri (uri);
+            exec = prefix + sanitized_uri;
+
             var keyfile = new GLib.KeyFile ();
             string entry = "Desktop Entry";
 
@@ -195,8 +198,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, independant profile and a launcher");
@@ -207,7 +208,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");
@@ -468,11 +468,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);