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

[Paweł Forysiuk]

[lp:~tuxator/midori/apple]

6201. By Paweł Forysiuk on 2013-06-25

Use double backslash for folder delimiter in webapp destkop file on win32

6202. By Paweł Forysiuk on 2013-06-25

Merge lp:midori

6203. By Paweł Forysiuk on 2013-06-25

Add quote and double slashes unconditionally on win32 for webapp uris

6204. By Paweł Forysiuk on 2013-06-25

Check for launcher type when creating lnk file and set shortcut argument accordingly

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

Revert merge lp:midori to make patch look sane again

6206. By Paweł Forysiuk on 2013-06-28

Read change from 6203 and 6204

6207. By Paweł Forysiuk on 2013-06-28

Revert accidental delete

[Cris Dywan (kalikiana)]

Nice stuff! Merged.

review: Approve

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2013-06-27 21:37:27 +0000
+++ extensions/apps.vala	2013-06-28 14:20:33 +0000
@@ -22,10 +22,16 @@
 
         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);
-
+            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);
             }
@@ -39,7 +45,12 @@
                 var pixbuf = Midori.Paths.get_icon (uri, null);
                 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);
@@ -61,7 +72,7 @@
                 yield stream.write_async (contents.data);
                 // Create a launcher/ menu
 #if HAVE_WIN32
-                // TODO: implement Win32 version
+                Midori.Sokoke.create_win32_desktop_lnk (prefix, title, 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"),

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-05-28 20:02:29 +0000
+++ midori/midori.vapi	2013-06-28 14:20:33 +0000
@@ -252,6 +252,9 @@
     [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 void create_win32_desktop_lnk (string prefix, string title, string uri);
+    #endif
     }
 }
 

=== modified file 'midori/sokoke.c'
--- midori/sokoke.c	2013-05-27 00:00:58 +0000
+++ midori/sokoke.c	2013-06-28 14: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)
 {
@@ -1148,3 +1153,59 @@
     return entry;
 }
 
+#ifdef G_OS_WIN32
+void
+sokoke_create_win32_desktop_lnk (gchar* prefix, gchar* title, gchar* uri)
+{
+    gchar* exec_dir, *exec_path, *argument;
+    gchar* filename, *lnk_file, *lnk_path;
+    gchar* launcher_type;
+
+    WCHAR desktop_dir[MAX_PATH];
+    WCHAR w[MAX_PATH];
+
+    IShellLink* pShellLink;
+    IPersistFile* pPersistFile;
+
+    /* Retrive current path of User's Desktop directory, could be moved / on different partition */
+    SHGetFolderPath (NULL, CSIDL_DESKTOPDIRECTORY, NULL, SHGFP_TYPE_CURRENT, &desktop_dir);
+    /* CSIDL_PROGRAMS for "start menu -> programs" instead - needs saner/shorter filename */
+
+    filename = midori_download_clean_filename (title);
+    lnk_file = g_strconcat (filename, ".lnk", NULL);
+    lnk_path = g_build_filename (desktop_dir, lnk_file, NULL);
+
+    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 */
+    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 (filename);
+    g_free (lnk_file);
+    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-06-28 14:20:33 +0000
@@ -128,4 +128,9 @@
 GtkWidget*
 sokoke_search_entry_new               (const gchar*        placeholder_text);
 
+#ifdef G_OS_WIN32
+void
+sokoke_create_win32_desktop_lnk (gchar* prefix, gchar* title, 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-06-28 14: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-03 19:37:36 +0000
+++ wscript	2013-06-28 14:20:33 +0000
@@ -326,6 +326,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: