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

List:       kde-commits
Subject:    playground/pim/mailody
From:       Tom Albers <tomalbers () kde ! nl>
Date:       2008-02-09 21:45:48
Message-ID: 1202593548.299366.22429.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 772993 by toma:

Add a User-Agent similar to KMail. Results in something like:
User-Agent: Mailody/0.5.0-svn (KDE/4.0.1; svn-772950; 2008-02-07)

CCMAIL: Jarosław Staniek <js@iidea.pl>


 M  +17 -3     CMakeLists.txt  
 A             cmake (directory)  
 A             cmake/modules (directory)  
 A             cmake/modules/FindKdeSubversion.cmake   \
trunk/KDE/kdepim/cmake/modules/FindKdeSubversion.cmake#772960  A             \
src/config-mailody.h.cmake    M  +21 -3     src/sendmessage.cpp  


--- trunk/playground/pim/mailody/CMakeLists.txt #772992:772993
@@ -46,12 +46,26 @@
 macro_optional_find_package(LibXslt)
 macro_log_feature(XSLTPROC_EXECUTABLE "xsltproc" "xsltproc" \
"http://xmlsoft.org/XSLT/" FALSE "" "Needed to generate Akonadi database code")  
-ADD_SUBDIRECTORY( libkdepim ) 
-ADD_SUBDIRECTORY( maildir ) 
-ADD_SUBDIRECTORY( akonadi ) 
+ADD_SUBDIRECTORY( libkdepim )
+ADD_SUBDIRECTORY( maildir )
+ADD_SUBDIRECTORY( akonadi )
 
 #------------------------------------- end akonadi stuff
+add_subdirectory(cmake)
 
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
+  if ( NOT KdeSubversion_FOUND )
+    find_package( KdeSubversion )
+  endif ( NOT KdeSubversion_FOUND )
+  if ( KdeSubversion_FOUND )
+    KdeSubversion_WC_INFO( ${PROJECT_SOURCE_DIR} Mailody )
+    string( SUBSTRING "${Mailody_WC_LAST_CHANGED_DATE}" 0 10 \
Mailody_WC_LAST_CHANGED_DATE ) +    set( mailody_svn_revision \
"svn-${Mailody_WC_REVISION}" ) +    set( mailody_svn_last_change \
"${Mailody_WC_LAST_CHANGED_DATE}" ) +  endif ( KdeSubversion_FOUND )
+endif (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
+configure_file(src/config-mailody.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-mailody.h ) +
 ADD_SUBDIRECTORY( akonadi_resource )
 ADD_SUBDIRECTORY( src ) 
 ADD_SUBDIRECTORY( icons ) 
--- trunk/playground/pim/mailody/src/sendmessage.cpp #772992:772993
@@ -1,6 +1,6 @@
 /* This file is part of the KDE project
 
-   Copyright (C) 2006-2007 KovoKs <info@kovoks.nl>
+   Copyright (C) 2006-2008 KovoKs <info@kovoks.nl>
    Copyright (C) 2007 Frode M. Døving <frode@lnix.net>
 
    This program is free software; you can redistribute it and/or
@@ -24,6 +24,7 @@
 #include "setup.h"
 #include "database.h"
 #include "global.h"
+#include <config-mailody.h>
 
 // Qt
 #include <QApplication>
@@ -158,9 +159,26 @@
     Date->setDateTime( KDateTime::currentLocalDateTime() );
     newMessage->setHeader( Date );
 
+    // useragent, similar to KMail - Copyright jstaniek.
+    QString agent;
+#if KDE_IS_VERSION(4,0,60)
+    // user agent, e.g. Mailody/1.9.50 (Windows/5.0; KDE/3.97.1; i686; svn-762186; \
2008-01-15) +    QStringList extraInfo;
+#if defined MAILODY_SVN_REVISION_STRING && defined MAILODY_SVN_LAST_CHANGE
+    extraInfo << MAILOLDY_SVN_REVISION_STRING << MAILODY_SVN_LAST_CHANGE;
+#endif
+    agent = KProtocolManager::userAgentForApplication( "Mailody",  \
KGlobal::mainComponent().aboutData()->version(), extraInfo ); +#else // < KDE 4.1
+    agent = QString("Mailody/" + KGlobal::mainComponent().aboutData()->version() + " \
(KDE/%1.%2.%3") +           .arg( KDE::versionMajor() ).arg( KDE::versionMinor() \
).arg( KDE::versionRelease() ) +#if defined MAILODY_SVN_REVISION_STRING && defined \
MAILODY_SVN_LAST_CHANGE +     + "; " MAILODY_SVN_REVISION_STRING "; " \
MAILODY_SVN_LAST_CHANGE +#endif
+     + ")";
+#endif
+
     KMime::Headers::UserAgent* userAgent= new KMime::Headers::UserAgent;
-    userAgent->fromUnicodeString( "Mailody-v" +
-                                  KGlobal::mainComponent().aboutData()->version(), \
"us-ascii" ); +    userAgent->fromUnicodeString( agent , "us-ascii" );
     newMessage->setHeader( userAgent );
 
     if ( !m_irt.isEmpty() ) {


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