[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon/kded-module
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-11-01 0:06:02
Message-ID: 1225497962.762577.20939.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 878369 by mkretz:

show error messagebox when there are "broken" groups in phonondevicesrc asking to \
attach the file to a bugreport. To be removed before the final release (or earlier) \
again -> no i18n

 M  +1 -1      CMakeLists.txt  
 M  +14 -1     phononserver.cpp  


--- trunk/KDE/kdebase/runtime/phonon/kded-module/CMakeLists.txt #878368:878369
@@ -29,7 +29,7 @@
    )
 
 kde4_add_plugin(kded_phononserver ${kded_phonon_SRCS})
-target_link_libraries(kded_phononserver ${KDE4_KDECORE_LIBS} ${KDE4_PHONON_LIBS} \
${KDE4_SOLID_LIBS} ${ASOUND_LIBRARY} ${PULSEAUDIO_LIBRARY}) \
+target_link_libraries(kded_phononserver ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} \
${KDE4_SOLID_LIBS} ${ASOUND_LIBRARY} ${PULSEAUDIO_LIBRARY})  install(TARGETS \
kded_phononserver  DESTINATION ${PLUGIN_INSTALL_DIR})  
 install(FILES phononserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
--- trunk/KDE/kdebase/runtime/phonon/kded-module/phononserver.cpp #878368:878369
@@ -22,6 +22,8 @@
 #include "audiodevice.h"
 
 #include <kconfiggroup.h>
+#include <kstandarddirs.h>
+#include <kmessagebox.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <KPluginFactory>
@@ -683,7 +685,18 @@
         const PS::AudioDevice dev(cardName, iconName, key, initialPreference, \
isAdvanced);  if (groupName.endsWith(QLatin1String("playback"))) {
             m_audioOutputDevices << dev;
-        } else if (groupName.endsWith(QLatin1String("capture"))) {
+        } else if (!groupName.endsWith(QLatin1String("capture"))) {
+            static bool alreadyShown = false;
+            if (!alreadyShown) {
+                alreadyShown = true;
+                KMessageBox::queuedMessageBox(0, KMessageBox::Error,
+                        QString("Something went wrong with your audio devices cache. \
" +                            "Please attach the file %1 to the bug report at "
+                            "http://bugs.kde.org/show_bug.cgi?id=173163")
+                        .arg(KStandardDirs::locateLocal("config", \
"phonondevicesrc")), +                        QString(), KMessageBox::AllowLink);
+            }
+        } else {
             m_audioCaptureDevices << dev;
         }
         alreadyFoundCards.insert(groupName);


[prev in list] [next in list] [prev in thread] [next in thread]