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

List:       kde-commits
Subject:    extragear/pim/mailody/src
From:       Tom Albers <toma () kde ! org>
Date:       2010-01-08 21:51:38
Message-ID: 1262987498.457246.3952.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1071839 by toma:

Remove the marble dependency.


 M  +0 -17     CMakeLists.txt  
 D             ip2geobase.cpp  
 D             ip2geobase.h  
 D             ip2geohostip.cpp  
 D             ip2geohostip.h  
 D             ip2geoipinfodb.cpp  
 D             ip2geoipinfodb.h  
 M  +0 -26     mainwindow.cpp  
 M  +0 -2      mainwindow.h  
 M  +0 -28     messagedata.cpp  
 M  +0 -3      messagedata.h  
 D             messageroutewidget.cpp  
 D             messageroutewidget.h  


--- trunk/extragear/pim/mailody/src/CMakeLists.txt #1071838:1071839
@@ -50,20 +50,11 @@
   recentmanager.cpp
   recentattributes.cpp
   flagmodifyjob.cpp
-  ip2geobase.cpp
-  ip2geohostip.cpp
-  ip2geoipinfodb.cpp
   contacttreemodel.cpp
   imagemodel.cpp
 )
 
 
-if (MARBLEWIDGET_FOUND)
-  SET(mailody_SRCS ${mailody_SRCS} messageroutewidget.cpp)
-  ADD_DEFINITIONS(-DWITHMARBLEWIDGET)
-endif (MARBLEWIDGET_FOUND)
-
-
 QT4_ADD_DBUS_ADAPTOR( mailody_SRCS
   net.mailody.mainwindow.xml
   mainwindow.h Mailody::MainWindow
@@ -101,10 +92,6 @@
   ADD_DEFINITIONS(-DWITHNEPOMUMPLAYGROUND)
 endif ( NEPOMUK_PIMO_FOUND )
 
-if (MARBLEWIDGET_FOUND)
-  TARGET_LINK_LIBRARIES(mailody ${TARGET_LINK_LIBRARIES} ${LIBMARBLEWIDGET_LIBRARY} \
                )
-endif (MARBLEWIDGET_FOUND)
-
 INSTALL(TARGETS mailody ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
@@ -150,10 +137,6 @@
   TARGET_LINK_LIBRARIES(mailodypart ${TARGET_LINK_LIBRARIES} \
${NEPOMUK_PIMO_TYPEANNOTATIONPLUGIN_LIBRARY})  endif ( NEPOMUK_PIMO_FOUND )
 
-if (MARBLEWIDGET_FOUND)
-  TARGET_LINK_LIBRARIES(mailodypart ${TARGET_LINK_LIBRARIES} \
                ${LIBMARBLEWIDGET_LIBRARY} )
-endif (MARBLEWIDGET_FOUND)
-
 install( FILES mailodypart.desktop  DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES mailodypartui.rc  DESTINATION ${DATA_INSTALL_DIR}/mailody)
 install(TARGETS mailodypart DESTINATION ${PLUGIN_INSTALL_DIR} )
--- trunk/extragear/pim/mailody/src/mainwindow.cpp #1071838:1071839
@@ -80,10 +80,6 @@
 using namespace Mailody;
 using namespace Akonadi;
 
-#ifdef WITHMARBLEWIDGET
-#include "messageroutewidget.h"
-#endif
-
 MainWindow::MainWindow( KXmlGuiWindow *guiWindow, KXMLGUIClient *guiClient,
                         QWidget *parent,
                         KActionCollection* actionCollection ) :
@@ -515,15 +511,6 @@
     connect( m_msgPrintAction, SIGNAL( triggered( bool ) ),
              SLOT( slotPrint() ) );
 
-#ifdef WITHMARBLEWIDGET
-    m_msgRouteAction = new KAction( this );
-    m_msgRouteAction->setText( i18n( "Origin..." ) );
-    m_actionCollection->addAction( "mailody_origin", m_msgRouteAction );
-    m_msgRouteAction->setIcon( KIcon( "marble" ) );
-    connect( m_msgRouteAction, SIGNAL( triggered( bool ) ),
-             SLOT( slotShowRoute() ) );
-#endif
-
 #ifdef WITHNEPOMUMPLAYGROUND
     m_msgPossibleTagAction = new KAction( this );
     m_msgPossibleTagAction->setText( i18n( "Possible tags..." ) );
@@ -1518,16 +1505,6 @@
     m_tabWidget->currentTabWidget()->print();
 }
 
-void MainWindow::slotShowRoute()
-{
-#ifdef WITHMARBLEWIDGET
-    MessageWidget *i =  m_tabWidget->currentTabWidget();
-    MessageRouteWidget* route = new MessageRouteWidget( this );
-    route->setIPs( i->msg()->route() );
-    route->show();
-#endif
-}
-
 #ifdef WITHNEPOMUMPLAYGROUND
 void MainWindow::slotShowPossibleTags()
 {
@@ -1554,9 +1531,6 @@
     m_fixedfontAction->setEnabled( message );
     m_msgDelAction->setEnabled( message );
     m_msgSaveAction->setEnabled( message );
-#ifdef WITHMARBLEWIDGET
-    m_msgRouteAction->setEnabled( message );
-#endif
 #ifdef WITHNEPOMUMPLAYGROUND
     m_msgPossibleTagAction->setEnabled( false /* it will get separate signals */ );
 #endif
--- trunk/extragear/pim/mailody/src/mainwindow.h #1071838:1071839
@@ -120,7 +120,6 @@
     void slotUserFlag( int flag );
 
     void slotSave();
-    void slotShowRoute();
 #ifdef WITHNEPOMUMPLAYGROUND
     void slotShowPossibleTags();
 #endif
@@ -195,7 +194,6 @@
     KAction                             *m_msgZoomOutAction;
     KAction                             *m_msgSaveAction;
     KAction                             *m_msgPrintAction;
-    KAction                             *m_msgRouteAction;
 #ifdef WITHNEPOMUMPLAYGROUND
     KAction                             *m_msgPossibleTagAction;
 #endif
--- trunk/extragear/pim/mailody/src/messagedata.cpp #1071838:1071839
@@ -238,34 +238,6 @@
         m_delete = true;
 }
 
-QStringList MessageData::route()
-{
-    QStringList ips;
-    QList<KMime::Headers::Base*> received = m_msg->headersByType( "Received" );
-    //kDebug() << received.count();
-    if ( !received.isEmpty() ) {
-        foreach( const KMime::Headers::Base* baseHeader, received ) {
-            QString header = baseHeader->asUnicodeString();
-            int start = header.indexOf( "[" );
-            if ( start == -1 )
-                continue;
-            ++start;
-
-            int end = header.indexOf( "]", start );
-            if (( end - start ) > 15 )
-                continue;
-
-            QString ip =  header.mid( start, ( end-start ) );
-            if ( ip.startsWith( QLatin1String( "192.168" ) )
-                    || ip.startsWith( QLatin1String( "127.0.0.1" ) ) )
-                continue;
-
-            ips.append( ip );
-        }
-    }
-    return ips;
-}
-
 /*
 #ifdef WITHNEPOMUMPLAYGROUND
 void MessageData::getAnnotations()
--- trunk/extragear/pim/mailody/src/messagedata.h #1071838:1071839
@@ -249,9 +249,6 @@
         return m_flagsCached.contains( flag );
     };
 
-    /** returns a list of ip's the message has travelled by **/
-    QStringList route();
-
 #ifdef WITHNEPOMUMPLAYGROUND
     QList<Nepomuk::Annotation*> possibleAnnotations();
 #endif


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