Qt: re-enable services dicovery and fix them

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index e2bacb3b719e4829a1c7b3e0f7c99b63d53baec5..6ead8823167d6d34869eff9ab2bf51bef156ae0f 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -641,11 +641,12 @@ void DialogsProvider::menuUpdateAction( QObject *data )
 
 void DialogsProvider::SDMenuAction( QString data )
 {
-    const char *psz_sd = qtu( data );
+    char *psz_sd = strdup( qtu( data ) );
     if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) )
         playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
     else
         playlist_ServicesDiscoveryRemove( THEPL, psz_sd );
+    free( psz_sd );
 }
 
 /**

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 5c45aba10c88c407177e07e57820936dc61aace8..8ca30a4ae2ef5ae31b6a3f6b5f991ff5ce037ace 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -398,14 +398,16 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf,
                             bool with_intf )
 {
     QMenu *menu = new QMenu( current );
+    QAction *act;
     if( mi )
     {
-        QAction *act=
-            menu->addAction( QIcon( ":/playlist_menu" ), qtr( "Play&list..." ),
-                    mi, SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
+        act = menu->addAction( QIcon( ":/playlist_menu" ),
+                               qtr( "Play&list..." ), mi,
+                               SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
         act->setData( "_static_" );
     }
-    menu->addMenu( SDMenu( p_intf ) );
+    act = menu->addMenu( SDMenu( p_intf ) );
+    act->setData( "_static_" );
     /*menu->addSeparator();
     menu->addAction( qtr( "Undock from Interface" ), mi,
                      SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );*/