Damjan Jovanovic : winemenubuilder: Use the command from the "open" verb.

[Alexandre Julliard]

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

Author: Damjan Jovanovic 
Date:   Wed Aug 24 04:47:07 2011 +0200

winemenubuilder: Use the command from the "open" verb.

---

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

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index e6dc504..f42f3b1 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -974,6 +974,7 @@ end:

static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream)
 {
+    static const WCHAR openW[] = {'o','p','e','n',0};
     WCHAR *extension;
     WCHAR *icon = NULL;
     WCHAR *comma;
@@ -999,7 +1000,7 @@ static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream)
     }
     else
     {
-        executable = assoc_query(ASSOCSTR_EXECUTABLE, extension, NULL);
+        executable = assoc_query(ASSOCSTR_EXECUTABLE, extension, openW);
         if (executable)
             hr = open_icon(executable, 0, FALSE, ppStream);
     }
@@ -2612,7 +2613,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package
             if (executableW)
                 openWithIconA = extract_icon(executableW, 0, NULL, FALSE);

-            friendlyAppNameW = assoc_query(ASSOCSTR_FRIENDLYAPPNAME, extensionW, NULL);
+            friendlyAppNameW = assoc_query(ASSOCSTR_FRIENDLYAPPNAME, extensionW, openW);
             if (friendlyAppNameW)
             {
                 friendlyAppNameA = wchars_to_utf8_chars(friendlyAppNameW);