[vlc-commits] gui/skins2: polish error diagnostics on dialog provider failure

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Wed Mar 15 10:07:45 2017 +0100| [eaf3926b0278f756e744d1b019ac31614c0b3c52] | committer: Jean-Baptiste Kempf

gui/skins2: polish error diagnostics on dialog provider failure

There can be more dialogs providers than qt, and qt might be compiled
even though the affected diagnostics are issued. To make the behavior
more relevant in/suitable for all circumstances:

 - the duplicate diagnostic has been removed, and;
 - mention of qt is removed.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eaf3926b0278f756e744d1b019ac31614c0b3c52
---

 modules/gui/skins2/src/dialogs.cpp   | 1 -
 modules/gui/skins2/src/skin_main.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp
index 0e86687..79885ea 100644
--- a/modules/gui/skins2/src/dialogs.cpp
+++ b/modules/gui/skins2/src/dialogs.cpp
@@ -164,7 +164,6 @@ bool Dialogs::init()
     m_pModule = module_need( m_pProvider, "dialogs provider", NULL, false );
     if( m_pModule == NULL )
     {
-        msg_Err( getIntf(), "no suitable dialogs provider found (hint: compile the qt plugin, and make sure it is loaded properly)" );
         vlc_object_release( m_pProvider );
         m_pProvider = NULL;
         return false;
diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index 00c011a..cc93d60 100644
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -244,7 +244,7 @@ static void *Run( void * p_obj )
     }
     if( Dialogs::instance( p_intf ) == NULL )
     {
-        msg_Err( p_intf, "cannot instantiate qt dialogs provider" );
+        msg_Err( p_intf, "cannot instantiate dialogs provider" );
         b_error = true;
         goto end;
     }