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

List:       kde-commits
Subject:    KDE/kdepim
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-02-25 11:48:12
Message-ID: 1235562492.521194.6331.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 931497 by tmcguire:

Merged revisions 930399 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r930399 | mutz | 2009-02-23 12:22:50 +0100 (Mon, 23 Feb 2009) | 1 line
  
  show{Error,Details}( QWidget * parent, ...) already fall back to \
                parentWidgetOrView() (or WId) when parent==0
........


 _M            . (directory)  
 M  +2 -2      kleopatra/commands/lookupcertificatescommand.cpp  


** trunk/KDE/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-8 \
13603,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-818 \
695,818697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,82904 \
9-829050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977- \
834992,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,83 \
5088-835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,8353 \
82-835383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434 \
-835435,835437,835439-835440,835447,835451-835938,836295,836363,836390,836393-836394,8 \
36404,836408,836472,836498,836510,836512,836524,837586,837719,837823,839641,839986-840 \
017,840019-840127,841817,841844,841986,841990,842323,842333,842495,842562-843750,84375 \
2-843753,843755-849403,849405-849784,849786-850255,850258-850261,850263-850305,850307-850329,850331-850387,850389-850421,850423-85
  0483,850485-850486,850488-850497,850499-850502,850504-850505,850507-850509,850511,85 \
0513-850573,850575-851249,851251-851253,851256-851293,851297-851306,851308-851309,8513 \
12,851314-851316,851320,851322,851325-851328,851333,851336,851342,851349,851351-851352 \
,851354,851358,851360-851371,851373,851376,851378,851380,851384,851389,851391,851395-8 \
51397,851399-852143,852637,852652,852736,852743,852759,853293,853769,853818,853947-853 \
957,853973,853982,853985,854004,854007,854025,854085,854399,854550-854628,856089,85632 \
4,856353,856356,856361,856370,856384,856528,856547,856635,856673,856711,856725-856726, \
856729,856734,856739,856952,856974,857033,857036-857038,857040,857047,857055,857076,85 \
7081-857082,857085,857148,857290,857305,857308,857310,857380,857396,857410,857444,8574 \
86,857528,857531,857534,857738,857772,857783,857799,858454,858464,858487,858688,858732 \
,858746,858755,858823,858838,859400,859888,860040,860059,860265,861198,861561,861815,861913,863905,863970,864002,866383,866597,8666
  82,866739,867069,867093,867475,867479,867497,868399-868400,868510,868512,868517,8685 \
33,868546,868795,868797,868813-868814,868935,869610,869627,869630,871375,872627-872628 \
,872861,872863,872887,872959,872969,873832,874391,874421,874707,874709,875182-875183,8 \
75188-875466,875468-875505,876312,876371,876380,876554,876637,876866,877028,877087,877 \
093,877099,877101-877103,877128-877129,877464,877481,877792,877794,877816,877930,87959 \
8-882331,882333-883958,883960-883963,883965-883968,883970,883972-883975,883977-883981, \
883983,883987,883993-883995,883997-883998,884002-884008,884015-884327,884329-885958,88 \
5960-887405,887407,887409-887663,887665-889343,889345-890603,894938,896104,896117,8961 \
22,898168,898171,898186,898616,898658,898963,898966-898974,898976-899293,900455,900706 \
,903577,905807,906910,909818,909832,909849-909850,909872,909889,910070,915154,915223,9 \
15225,915260,915287,915679,915720,915725,917688,918197,918237,918578,918582-918583,918709,921778,922041,924667,924727,924755,924758
  ,924763,924766,925261,927487,928246,928257-928285,928287-928290,928292,928295-928296 \
,928299-928308,928310,928313-928314,928316,928323,928325-928326,928328-928334,928337-9 \
28340,928343,928345-928352,928354-928359,928361-928385,928387-928419,928421-928871,928874-930366,930372,930384,930386,930396-930398,930784
  + /branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-81 \
3603,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-8186 \
95,818697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,829049 \
-829050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977-8 \
34992,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,835 \
088-835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,83538 \
2-835383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434- \
835435,835437,835439-835440,835447,835451-835938,836295,836363,836390,836393-836394,83 \
6404,836408,836472,836498,836510,836512,836524,837586,837719,837823,839641,839986-8400 \
17,840019-840127,841817,841844,841986,841990,842323,842333,842495,842562-843750,843752 \
-843753,843755-849403,849405-849784,849786-850255,850258-850261,850263-850305,850307-850329,850331-850387,850389-850421,850423-85
  0483,850485-850486,850488-850497,850499-850502,850504-850505,850507-850509,850511,85 \
0513-850573,850575-851249,851251-851253,851256-851293,851297-851306,851308-851309,8513 \
12,851314-851316,851320,851322,851325-851328,851333,851336,851342,851349,851351-851352 \
,851354,851358,851360-851371,851373,851376,851378,851380,851384,851389,851391,851395-8 \
51397,851399-852143,852637,852652,852736,852743,852759,853293,853769,853818,853947-853 \
957,853973,853982,853985,854004,854007,854025,854085,854399,854550-854628,856089,85632 \
4,856353,856356,856361,856370,856384,856528,856547,856635,856673,856711,856725-856726, \
856729,856734,856739,856952,856974,857033,857036-857038,857040,857047,857055,857076,85 \
7081-857082,857085,857148,857290,857305,857308,857310,857380,857396,857410,857444,8574 \
86,857528,857531,857534,857738,857772,857783,857799,858454,858464,858487,858688,858732 \
,858746,858755,858823,858838,859400,859888,860040,860059,860265,861198,861561,861815,861913,863905,863970,864002,866383,866597,8666
  82,866739,867069,867093,867475,867479,867497,868399-868400,868510,868512,868517,8685 \
33,868546,868795,868797,868813-868814,868935,869610,869627,869630,871375,872627-872628 \
,872861,872863,872887,872959,872969,873832,874391,874421,874707,874709,875182-875183,8 \
75188-875466,875468-875505,876312,876371,876380,876554,876637,876866,877028,877087,877 \
093,877099,877101-877103,877128-877129,877464,877481,877792,877794,877816,877930,87959 \
8-882331,882333-883958,883960-883963,883965-883968,883970,883972-883975,883977-883981, \
883983,883987,883993-883995,883997-883998,884002-884008,884015-884327,884329-885958,88 \
5960-887405,887407,887409-887663,887665-889343,889345-890603,894938,896104,896117,8961 \
22,898168,898171,898186,898616,898658,898963,898966-898974,898976-899293,900455,900706 \
,903577,905807,906910,909818,909832,909849-909850,909872,909889,910070,915154,915223,9 \
15225,915260,915287,915679,915720,915725,917688,918197,918237,918578,918582-918583,918709,921778,922041,924667,924727,924755,924758
  ,924763,924766,925261,927487,928246,928257-928285,928287-928290,928292,928295-928296 \
,928299-928308,928310,928313-928314,928316,928323,928325-928326,928328-928334,928337-9 \
28340,928343,928345-928352,928354-928359,928361-928385,928387-928419,928421-928871,928874-930366,930372,930384,930386,930396-930399,930784
                
--- trunk/KDE/kdepim/kleopatra/commands/lookupcertificatescommand.cpp #931496:931497
@@ -250,10 +250,10 @@
         return;
 
     if ( keyListing.result.error() && !keyListing.result.error().isCanceled() )
-        showError( dialogOrParentWidgetOrView(), keyListing.result );
+        showError( dialog, keyListing.result );
 
     if ( keyListing.result.isTruncated() )
-        showResult( dialogOrParentWidgetOrView(), keyListing.result );
+        showResult( dialog, keyListing.result );
 
     if ( dialog ) {
         dialog->setCertificates( keyListing.keys );


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

Configure | About | News | Add a list | Sponsored by KoreLogic