Qt: correctly handle Unicode in Win7 jump lists

[vlc] / modules / gui / qt4 / recents.cpp

diff --git a/modules/gui/qt4/recents.cpp b/modules/gui/qt4/recents.cpp
index 7a210f00b67f4e747889616c5c17ed24a7ebfd97..5112c99f7f0d09efb9d7c36a8067b4707bfbaad7 100644 (file)
--- a/modules/gui/qt4/recents.cpp
+++ b/modules/gui/qt4/recents.cpp
@@ -33,9 +33,21 @@
 #include <QSignalMapper>
 
 #ifdef WIN32
-#include <shlobj.h>
+    #include <shlobj.h>
+    /* typedef enum  {
+        SHARD_PIDL              = 0x00000001,
+        SHARD_PATHA             = 0x00000002,
+        SHARD_PATHW             = 0x00000003,
+        SHARD_APPIDINFO         = 0x00000004,
+        SHARD_APPIDINFOIDLIST   = 0x00000005,
+        SHARD_LINK              = 0x00000006,
+        SHARD_APPIDINFOLINK     = 0x00000007,
+        SHARD_SHELLITEM         = 0x00000008 
+    } SHARD; */
+    #define SHARD_PATHW 0x00000003
 #endif
 
+
 RecentsMRL* RecentsMRL::instance = NULL;
 
 RecentsMRL::RecentsMRL( intf_thread_t *_p_intf ) : p_intf( _p_intf )
@@ -49,7 +61,7 @@ RecentsMRL::RecentsMRL( intf_thread_t *_p_intf ) : p_intf( _p_intf )
             playMRL( const QString & ) );
 
     /* Load the filter psz */
-    char* psz_tmp = config_GetPsz( p_intf, "qt-recentplay-filter" );
+    char* psz_tmp = var_InheritString( p_intf, "qt-recentplay-filter" );
     if( psz_tmp && *psz_tmp )
         filter = new QRegExp( psz_tmp, Qt::CaseInsensitive );
     else
@@ -57,7 +69,7 @@ RecentsMRL::RecentsMRL( intf_thread_t *_p_intf ) : p_intf( _p_intf )
     free( psz_tmp );
 
     load();
-    isActive = config_GetInt( p_intf, "qt-recentplay" );
+    isActive = var_InheritBool( p_intf, "qt-recentplay" );
     if( !isActive ) clear();
 }
 
@@ -76,7 +88,7 @@ void RecentsMRL::addRecent( const QString &mrl )
 
 #ifdef WIN32
     /* Add to the Windows 7 default list in taskbar */
-    SHAddToRecentDocs( 0x00000002 , qtu( mrl ) );
+    SHAddToRecentDocs( SHARD_PATHW, qtu( mrl ) );
 #endif
 
     int i_index = stack->indexOf( mrl );