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

List:       kde-commits
Subject:    KDE/kdepim
From:       Volker Krause <vkrause () kde ! org>
Date:       2008-01-17 17:15:40
Message-ID: 1200590140.038179.16021.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 762678 by vkrause:

Merged revisions 762653 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r762653 | vkrause | 2008-01-17 17:10:59 +0100 (Thu, 17 Jan 2008) | 4 lines
  
  Prevent dragging of internal URLs.
  
  Kolab issue 2401
........


 _M            . (directory)  
 M  +8 -1      kmail/kmreaderwin.cpp  


** trunk/KDE/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,708854,709032-70 \
9084,709134,710606-710610,711603-711604,711623,712056,714358,715112,715206-715217,7152 \
19-715232,715234-716226,716228-716287,716289-716299,716302-716375,716377-716392,716394 \
-716414,716416-716437,716439-716475,716477-716776,716779-716881,716883-716899,716901-7 \
16903,716933-717190,717192-717213,717215-717251,717253,717255-717263,717265-717284,717 \
287-717291,717294,717296-717303,717305-717312,717314-717317,717319-718340,718342-71850 \
5,718507-721121,721123-721406,721408-721424,721426-723030,723032-724381,724383-724384, \
724386-724443,724445-724768,724770-727625,727627-728016,728018-728089,728091-728450,72 \
8452-728558,728560-728580,728582-728814,728816-729239,729241-729283,729285-729580,7295 \
83-729660,729662-731333,731335-731356,731358-731361,731363-731669,731671-731700,731702 \
-731719,731721-731734,731736-731867,731869-731870,731872-732022,732024-732421,732423-733047,733050-733088,733090-733100,733102-733
  148,733150-733463,733466-733468,733470-733482,733484-733685,733687,733689-733875,733 \
877-734534,734536,734538-734579,734582,734586-734591,734593-734733,734735-735174,73517 \
6-735204,735206-735246,735248-735280,735283-735286,735288-735300,735302-736198,736200- \
736232,736235-736242,736244-736314,736316-736376,736378,736380-736390,736392-737071,73 \
7073-737092,737094-737483,737485-737489,737492-737495,737497-739062,739064-739134,7391 \
36-739156,739158-739602,739604-739688,739690-739993,739995-740022,740024-740109,740111 \
-740116,740118-740147,740149-740152,740154-740441,740443-740446,740448-740459,740461-7 \
40471,740473-740475,740478-740487,740489-740519,740521-740528,740530-740535,740537-740 \
574,740576-740588,740591-740607,740609-741781,741783-741805,741807-741832,741834-74190 \
1,741903-742150,742152-742213,742216-742229,742231-742288,742290-742291,742293,742296- \
742602,742604-742670,742673-742986,742988-742990,742994-742999,743001,743004,743006-743010,743012-743019,743021-743022,743024-74302
  5,743027-743887,743889-744004,744006-744086,744088-744091,744093-744109,744111-74467 \
5,744678-744692,744694-744707,744709-745805,745808-745812,745815-746844,746846-746872, \
746875-746896,746898-746924,746926-746931,746933-746978,746980-747511,747513-747517,74 \
7519-747583,747585-747587,747589-747591,747593-747597,747599-747621,747623-747640,7476 \
42-747791,747793-748003,748005-748349,748351-748424,748426-748496,748498-748500,748502 \
-748528,748530-750092,750094-750561,750564-750566,750568-750610,750904-750920,758955 \
/branches/work/kdab-post-4.0/kdepim:1-706050,708721,708760,709048,711609,717175,717749
  + /branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,708854,709032-709 \
084,709134,710606-710610,711603-711604,711623,712056,714358,715112,715206-715217,71521 \
9-715232,715234-716226,716228-716287,716289-716299,716302-716375,716377-716392,716394- \
716414,716416-716437,716439-716475,716477-716776,716779-716881,716883-716899,716901-71 \
6903,716933-717190,717192-717213,717215-717251,717253,717255-717263,717265-717284,7172 \
87-717291,717294,717296-717303,717305-717312,717314-717317,717319-718340,718342-718505 \
,718507-721121,721123-721406,721408-721424,721426-723030,723032-724381,724383-724384,7 \
24386-724443,724445-724768,724770-727625,727627-728016,728018-728089,728091-728450,728 \
452-728558,728560-728580,728582-728814,728816-729239,729241-729283,729285-729580,72958 \
3-729660,729662-731333,731335-731356,731358-731361,731363-731669,731671-731700,731702- \
731719,731721-731734,731736-731867,731869-731870,731872-732022,732024-732421,732423-733047,733050-733088,733090-733100,733102-733
  148,733150-733463,733466-733468,733470-733482,733484-733685,733687,733689-733875,733 \
877-734534,734536,734538-734579,734582,734586-734591,734593-734733,734735-735174,73517 \
6-735204,735206-735246,735248-735280,735283-735286,735288-735300,735302-736198,736200- \
736232,736235-736242,736244-736314,736316-736376,736378,736380-736390,736392-737071,73 \
7073-737092,737094-737483,737485-737489,737492-737495,737497-739062,739064-739134,7391 \
36-739156,739158-739602,739604-739688,739690-739993,739995-740022,740024-740109,740111 \
-740116,740118-740147,740149-740152,740154-740441,740443-740446,740448-740459,740461-7 \
40471,740473-740475,740478-740487,740489-740519,740521-740528,740530-740535,740537-740 \
574,740576-740588,740591-740607,740609-741781,741783-741805,741807-741832,741834-74190 \
1,741903-742150,742152-742213,742216-742229,742231-742288,742290-742291,742293,742296- \
742602,742604-742670,742673-742986,742988-742990,742994-742999,743001,743004,743006-743010,743012-743019,743021-743022,743024-74302
  5,743027-743887,743889-744004,744006-744086,744088-744091,744093-744109,744111-74467 \
5,744678-744692,744694-744707,744709-745805,745808-745812,745815-746844,746846-746872, \
746875-746896,746898-746924,746926-746931,746933-746978,746980-747511,747513-747517,74 \
7519-747583,747585-747587,747589-747591,747593-747597,747599-747621,747623-747640,7476 \
42-747791,747793-748003,748005-748349,748351-748424,748426-748496,748498-748500,748502 \
-748528,748530-750092,750094-750561,750564-750566,750568-750610,750904-750920,758955,762653 \
/branches/work/kdab-post-4.0/kdepim:1-706050,708721,708760,709048,711609,717175,717749
                
--- trunk/KDE/kdepim/kmail/kmreaderwin.cpp #762677:762678
@@ -1846,12 +1846,19 @@
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotUrlOn(const QString &aUrl)
 {
+  const KUrl url(aUrl);
+  if ( url.protocol() == "kmail" || url.protocol() == "x-kmail"
+       || (url.protocol().isEmpty() && url.path().isEmpty()) ) {
+    mViewer->setDNDEnabled( false );
+  } else {
+    mViewer->setDNDEnabled( true );
+  }
+
   if ( aUrl.trimmed().isEmpty() ) {
     KPIM::BroadcastStatus::instance()->reset();
     return;
   }
 
-  const KUrl url(aUrl);
   mUrlClicked = url;
 
   const QString msg = URLHandlerManager::instance()->statusBarMessage( url, this );


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