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

[Paweł Forysiuk]

[Cris Dywan (kalikiana)]

../extensions/apps.vala:26.20-26.67: warning: local variable `filename' declared but never used

It'd be good to converge win32 and linux code to have a get_launcher_filename() function used in both places instead of sokoke. There's no win32 so it doesn't need to be in sokoke.

review: Needs Fixing

[lp:~tuxator/midori/apple-2]

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

Don't needlessly recompute filename from launcher title

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2013-06-29 22:12:13 +0000
+++ extensions/apps.vala	2013-07-04 19:59:29 +0000
@@ -74,7 +74,7 @@
                 yield stream.write_async (contents.data);
                 // Create a launcher/ menu
 #if HAVE_WIN32
-                Midori.Sokoke.create_win32_desktop_lnk (prefix, title, uri);
+                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"),
@@ -191,14 +191,16 @@
                             try {
                                 launcher.file.trash (null);
                                 store.remove (iter);
+
+                                string filename = Midori.Download.clean_filename (launcher.name);
 #if HAVE_WIN32
-                                string filename = Midori.Download.clean_filename (launcher.name);
-                                var lnk_filename = Midori.Sokoke.get_win32_desktop_lnk_path_from_title (filename);
-                                var lnk_file = File.new_for_path (lnk_filename);
-                                lnk_file.trash ();
+                                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 ());
-                                string filename = Midori.Download.clean_filename (launcher.name);
                                 data_dir.get_child ("applications").get_child (filename + ".desktop").trash ();
 #endif
                             }

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-06-29 22:12:13 +0000
+++ midori/midori.vapi	2013-07-04 19:59:29 +0000
@@ -253,8 +253,8 @@
     namespace Sokoke {
         public static uint gtk_action_count_modifiers (Gtk.Action action);
     #if HAVE_WIN32
-        public static string get_win32_desktop_lnk_path_from_title (string title);
-        public static void create_win32_desktop_lnk (string prefix, string title, string uri);
+        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-29 22:12:13 +0000
+++ midori/sokoke.c	2013-07-04 19:59:29 +0000
@@ -1155,27 +1155,24 @@
 
 #ifdef G_OS_WIN32
 gchar*
-sokoke_get_win32_desktop_lnk_path_from_title (gchar* title)
+sokoke_get_win32_desktop_lnk_path_for_filename (gchar* filename)
 {
-    WCHAR desktop_dir[MAX_PATH];
-    gchar* filename, *lnk_path, *lnk_file;
+    const gchar* desktop_dir;
+    gchar* lnk_path, *lnk_file;
 
-    /* Retrive current path of User's Desktop directory, could be moved / on different partition */
-    SHGetFolderPath (NULL, CSIDL_DESKTOPDIRECTORY, NULL, SHGFP_TYPE_CURRENT, (LPSTR)&desktop_dir);
     /* CSIDL_PROGRAMS for "start menu -> programs" instead - needs saner/shorter filename */
+    desktop_dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
 
-    filename = midori_download_clean_filename (title);
     lnk_file = g_strconcat (filename, ".lnk", NULL);
-    lnk_path = g_build_filename ((gchar*)desktop_dir, lnk_file, NULL);
+    lnk_path = g_build_filename (desktop_dir, lnk_file, NULL);
 
-    g_free (filename);
     g_free (lnk_file);
 
     return lnk_path;
 }
 
 void
-sokoke_create_win32_desktop_lnk (gchar* prefix, gchar* title, gchar* uri)
+sokoke_create_win32_desktop_lnk (gchar* prefix, gchar* filename, gchar* uri)
 {
     WCHAR w[MAX_PATH];
 
@@ -1203,7 +1200,7 @@
     /* pShellLink->lpVtbl->SetIconLocation (pShellLink, icon_path, icon_index); */
 
     /* Save link */
-    lnk_path = sokoke_get_win32_desktop_lnk_path_from_title (title);
+    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);

=== modified file 'midori/sokoke.h'
--- midori/sokoke.h	2013-06-29 22:12:13 +0000
+++ midori/sokoke.h	2013-07-04 19:59:29 +0000
@@ -130,10 +130,10 @@
 
 #ifdef G_OS_WIN32
 gchar*
-sokoke_get_win32_desktop_lnk_path_from_title (gchar* title);
+sokoke_get_win32_desktop_lnk_path_for_filename (gchar* filename);
 
 void
-sokoke_create_win32_desktop_lnk (gchar* prefix, gchar* title, gchar* uri);
+sokoke_create_win32_desktop_lnk (gchar* prefix, gchar* filename, gchar* uri);
 #endif
 
 #endif /* !__SOKOKE_H__ */