Damjan Jovanovic : winemenubuilder: Only generate associations for the " open" verb.

Alexandre Julliard julliard at winehq.org
Mon Jun 29 09:17:40 CDT 2009


Module: wine
Branch: master
Commit: b3f967a02206ec86882e3d47eeacbc2fd63be83b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b3f967a02206ec86882e3d47eeacbc2fd63be83b

Author: Damjan Jovanovic <damjan.jov at gmail.com>
Date:   Sat Jun 27 15:28:34 2009 +0200

winemenubuilder: Only generate associations for the "open" verb.

---

 programs/winemenubuilder/winemenubuilder.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 0549eb5..27a9e5e 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -1692,6 +1692,7 @@ static void update_association(LPCWSTR extension, LPCSTR mimeType, LPCWSTR progI
 
 static BOOL cleanup_associations(void)
 {
+    static const WCHAR openW[] = {'o','p','e','n',0};
     HKEY assocKey;
     BOOL hasChanged = FALSE;
     if ((assocKey = open_associations_reg_key()))
@@ -1729,7 +1730,7 @@ static BOOL cleanup_associations(void)
                     done = TRUE;
                     goto end;
                 }
-                command = assoc_query(ASSOCSTR_COMMAND, extensionW, NULL);
+                command = assoc_query(ASSOCSTR_COMMAND, extensionW, openW);
                 if (command == NULL)
                 {
                     char *desktopFile = reg_get_valA(assocKey, extensionA, "DesktopFile");
@@ -1841,6 +1842,7 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c
 
 static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir)
 {
+    static const WCHAR openW[] = {'o','p','e','n',0};
     struct list *nativeMimeTypes = NULL;
     LSTATUS ret = 0;
     int i;
@@ -1960,7 +1962,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package
                 }
             }
 
-            commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, NULL);
+            commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, openW);
             if (commandW == NULL)
                 /* no command => no application is associated */
                 goto end;




More information about the wine-cvs mailing list