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

List:       kde-commits
Subject:    kdeextragear-1/amarok/src/amarokcore
From:       Max Howell <max.howell () methylblue ! com>
Date:       2005-02-16 4:15:56
Message-ID: 20050216041556.EE2321CF4F () office ! kde ! org
[Download RAW message or body]

CVS commit by mhowell: 

Work better. Although here the subject always comes up as "ession" I'm assuming a \
kdelibs/kmail bug.. Dunno. Doesn't make any sense I tried just setting it to "CHUNKY \
SAUSAGES!" but that didn't work either. CCMAIL:amarok-devel@lists.sf.net


  M +21 -12    crashhandler.cpp   1.17


--- kdeextragear-1/amarok/src/amarokcore/crashhandler.cpp  #1.16:1.17
@@ -28,4 +28,5 @@ extern "C"
 #include <qregexp.h>
 #include <qtextstream.h>
+#include <taglib/taglib.h>
 
 
@@ -67,5 +68,5 @@ namespace amaroK
 
             QString path = amaroK::saveLocation() + "backtrace";
-            QString subject = APP_VERSION;
+            QString subject = APP_VERSION " ";
             QString body = i18n(
                     "amaroK has crashed! We're terribly sorry about this :(\n\n"
@@ -78,5 +79,11 @@ namespace amaroK
                     "Build date: " __DATE__ "\n"
                     "CC version: " __VERSION__ "\n" //assuming we're using GCC
-                    "KDElibs:    " KDE_VERSION_STRING "\n";
+                    "KDElibs:    " KDE_VERSION_STRING "\n"
+                    "TagLib:     %2.%3.%4\n";
+
+            body = body.arg( AmarokConfig::soundSystem() )
+                    .arg( TAGLIB_MAJOR_VERSION )
+                    .arg( TAGLIB_MINOR_VERSION )
+                    .arg( TAGLIB_PATCH_VERSION );
 
             #ifdef NDEBUG
@@ -127,23 +134,25 @@ namespace amaroK
             const QString fileCommandOutput = runCommand( "file `which amarokapp`" \
);  
-            if( fileCommandOutput.findRev( "not stripped", false ) < 0 )
-                subject += " [stripped]";
+            if( fileCommandOutput.find( "not stripped", false ) == -1 )
+                subject += "[stripped]";
 
             if( !bt.isEmpty() ) {
                 const int invalidFrames = bt.contains( \
                QRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ \\w* \\?\\?") );
                 const int validFrames = bt.contains( \
QRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+") ); +                const int totalFrames = \
invalidFrames + validFrames;  
-                if( invalidFrames > 0 && validFrames / invalidFrames < 2 )
-                    subject += " [likely invalid]";
-
-                if( validFrames < 5 )
-                    subject += " [short]";
+                subject += QString("[validity: %1]").arg( double(validFrames) / \
totalFrames, 0, 'f', 2 ); +                subject += QString("[frames: %1]").arg( \
totalFrames );  
-                if( bt.contains( QRegExp("at \\w*\\.cpp:\\d+\n") ) >= 0 )
-                    subject += " [good]";
+                if( bt.find( QRegExp(" at \\w*\\.cpp:\\d+\n") ) >= 0 )
+                    subject += "[line numbers]";
             }
             else
                 subject += "[empty]";
 
+            subject += QString("[%1]").arg( AmarokConfig::soundSystem().remove( \
QRegExp("-?engine") ) ); +
+            debug() << subject << endl;
+
 
             //TODO -fomit-frame-pointer buggers up the backtrace, so detect it
@@ -167,5 +176,5 @@ namespace amaroK
                     /*bcc*/         QString(),
                     /*subject*/     subject,
-                    /*body*/        body.arg( AmarokConfig::soundSystem() ),
+                    /*body*/        body,
                     /*messageFile*/ QString(),
                     /*attachURLs*/  QStringList( path ),


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