[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-07-30 18:50:27
Message-ID: 1248979827.655493.2780.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1004707 by tmcguire:

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

........
  r1003538 | mutz | 2009-07-28 11:59:48 +0200 (Tue, 28 Jul 2009) | 1 line
  
  Disable gpg-agent connectivity test on Windows, as gpg-agent is started on-demand \
                by all tools there
........
SVN_MERGE


 _M            . (directory)  
 M  +2 -0      kleopatra/commands/selftestcommand.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,928226,928232,928235,928240,928244,928246,928257-928285 \
,928287-928290,928292,928295-928296,928299-928308,928310,928313-928314,928316,928323,9 \
28325-928326,928328-928334,928337-928340,928343,928345-928352,928354-928359,928361-928 \
385,928387-928871,928874-930366,930372,930375-930520,930522-931400,931402-931403,93140 \
5-931406,931408-931591,931593,931595-931597,931602,931605,931607,931610-931612,931614, \
931617-931618,931620-932375,932447,932662,932674,932684,932725,932773,932882,934932,93 \
4940,934942,935002,935004-935005,935007,935018-935019,935021-935022,935042,935217,9352 \
28,935706,936467,937830,937850,937852,938080,938085,938087,938089-938090,938098,938103 \
,938113,938122,938172,938837-938844,940212,940215,940217-940219,940221,941504,941515,9 \
41730,941736,941738-941739,941808,941812,943067,943122,943129,943199,943730,943732-943 \
733,943755,943833,943847,943906,943912,944847,944850,944924,944950-944957,944959-945303,945305-945328,945330-945344,945346-947276,9
  47278-947463,947465-948212,948214-948250,948253-948310,948312-948326,948328-948333,9 \
48336-948640,948642-948667,948669-948685,948687-948704,948706-948708,948710,948712-949 \
994,949996-950008,950010-950093,950095-950193,950195-951097,951099-951505,951507-95151 \
4,951516-951806,951808-951809,951812-951887,951889-951890,951894-951919,951921-951922, \
951924-951942,951944-951964,951966-953091,953093-953549,953590,953652,953931,953962,95 \
4387,955059,955061,956783-956784,956796,956798,956808,956870,957554,957556,957558,9575 \
60,957565,957591,957595,957625,958596,958755,958759,959905-959908,959937-959938,959942 \
,959948-959949,959959,959961,959963,959992,960005,960101,960106,960134,960337,960343,9 \
60715-960716,960925,960990,960995,961010,961090,961182-961283,961285-961698,961700,961 \
705,961709-961712,961714-961715,961720,961722-961724,961731-961732,961734-961755,96175 \
7-961760,961762,961764-961858,961860-962328,962330-962593,962595-962664,962666-962675,962677-962803,962805-962808,962810-963289,963
  782,964044,964350,964446,964931,965019,965053,965206,965363,966609,966693,966821,967 \
136,967419,967432,967863,968006,968031-968366,968369,968371-968375,968377-968386,96838 \
8-968439,968441-969530,969532-969693,969695-970620,970622-970686,970694,970697,970699, \
970701,970705,970708,970712,970714-970756,970758-970762,970764-971343,971345-971346,97 \
1348-973024,973026,973028-973512,973514,973518-973521,973527,973529-973531,973533,9735 \
37,973541,973543-973552,973554-973566,973568-974162,974164-974416,974418-974429,974431 \
-974432,974434-975523,975525-977025,977029-977062,977064,977066,977069,977071,977073,9 \
77076,977079,977081-977550,977552-977783,977785-977803,977805-977839,977841-977849,977 \
851-977904,977906-978945,979702,979854,979874,979886,980011,980262,981052,981122,98159 \
6,982309,982636,982977,983096,983112-983113,983118,983121,983125,983130-983131,983136, \
983362,983366-983419,983421,983423-983424,983439,983537,983541,983598-983600,983607,983618-983619,983625,983767,983778,983785,98378
  7,983858,983897,985093,985129-985130,985205,985212-985213,985232-985233,985434,98543 \
6,985438-985439,985575,985879,986112,986114,986117,986133,986542,986544,986555,986570, \
986887,986965,986969,987053-987054,987066-987067,987070,989396,989514,989845-989847,98 \
9948,989954,990008,990537-990538,990774,991787,992553,992558,992560,992563,992565-9925 \
66,992665,992759,992871,993410,993423,993633,993823,994267,994275-994276,994657,995480 \
,996004,998025,998459,999842,1000512,1000998,1001006,1001019,1001185,1001279,1001281,1 \
001354,1001360,1001465,1001528,1001563-1001826,1001828-1001835,1001837-1002665,1002667 \
-1002945,1002947-1002963,1002965-1002978,1002980,1002982,1002984,1002986-1002992,10029 \
94-1003206,1003208-1003222,1003224-1003537,1003539-1003664,1003666-1003667,1003669-100 \
4069,1004072-1004073,1004075-1004135,1004137,1004140-1004153,1004157-1004170,1004172-1004200,1004202-1004554 \
/branches/kdepim/soc/kdepim:1-976464 \
/branches/work/akonadi-ports/kdepim:1-982690,983152-983679,983682-98368  \
9,983691-983808,983810-983816,983818-983822,983824-984000,984002-984066,984068-984464, \
984466,984468-984547,984549-984865,984868-984869,984871-985168,985170-985225,985227-98 \
5296,985298-985355,985357-985376,985378-985380,985382-985384,985391,985393-985418,9854 \
20-985621,985624-985689,985692-986257,986259-986273,986275-986285,986287-986407,986409 \
-986533,986535-986581,986583-986596,986598,986600-986682,986684-986726,986728-986742,9 \
86745,986751,986754,986765-986769,986771,986773-986996,986998-987007,987009-987148,987 \
150-987483,987485-987521,987523-987563,987565-987583,987585-987587,987589-987607,98760 \
9-987695,987697-987699,987701-987715,987717-987778,987780-987798,987800-988159,988161- \
988442,988444-988543,988545-989148,989150,989152,989154-989155,989157-989164,989166-98 \
9168,989170-989171,989173-989181,989183-989310,989312-989323,989325-989352,989354-989422,989424-989780,989782-991171,994702,996350
  + /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,928226,928232,928235,928240,928244,928246,928257-928285 \
,928287-928290,928292,928295-928296,928299-928308,928310,928313-928314,928316,928323,9 \
28325-928326,928328-928334,928337-928340,928343,928345-928352,928354-928359,928361-928 \
385,928387-928871,928874-930366,930372,930375-930520,930522-931400,931402-931403,93140 \
5-931406,931408-931591,931593,931595-931597,931602,931605,931607,931610-931612,931614, \
931617-931618,931620-932375,932447,932662,932674,932684,932725,932773,932882,934932,93 \
4940,934942,935002,935004-935005,935007,935018-935019,935021-935022,935042,935217,9352 \
28,935706,936467,937830,937850,937852,938080,938085,938087,938089-938090,938098,938103 \
,938113,938122,938172,938837-938844,940212,940215,940217-940219,940221,941504,941515,9 \
41730,941736,941738-941739,941808,941812,943067,943122,943129,943199,943730,943732-943 \
733,943755,943833,943847,943906,943912,944847,944850,944924,944950-944957,944959-945303,945305-945328,945330-945344,945346-947276,9
  47278-947463,947465-948212,948214-948250,948253-948310,948312-948326,948328-948333,9 \
48336-948640,948642-948667,948669-948685,948687-948704,948706-948708,948710,948712-949 \
994,949996-950008,950010-950093,950095-950193,950195-951097,951099-951505,951507-95151 \
4,951516-951806,951808-951809,951812-951887,951889-951890,951894-951919,951921-951922, \
951924-951942,951944-951964,951966-953091,953093-953549,953590,953652,953931,953962,95 \
4387,955059,955061,956783-956784,956796,956798,956808,956870,957554,957556,957558,9575 \
60,957565,957591,957595,957625,958596,958755,958759,959905-959908,959937-959938,959942 \
,959948-959949,959959,959961,959963,959992,960005,960101,960106,960134,960337,960343,9 \
60715-960716,960925,960990,960995,961010,961090,961182-961283,961285-961698,961700,961 \
705,961709-961712,961714-961715,961720,961722-961724,961731-961732,961734-961755,96175 \
7-961760,961762,961764-961858,961860-962328,962330-962593,962595-962664,962666-962675,962677-962803,962805-962808,962810-963289,963
  782,964044,964350,964446,964931,965019,965053,965206,965363,966609,966693,966821,967 \
136,967419,967432,967863,968006,968031-968366,968369,968371-968375,968377-968386,96838 \
8-968439,968441-969530,969532-969693,969695-970620,970622-970686,970694,970697,970699, \
970701,970705,970708,970712,970714-970756,970758-970762,970764-971343,971345-971346,97 \
1348-973024,973026,973028-973512,973514,973518-973521,973527,973529-973531,973533,9735 \
37,973541,973543-973552,973554-973566,973568-974162,974164-974416,974418-974429,974431 \
-974432,974434-975523,975525-977025,977029-977062,977064,977066,977069,977071,977073,9 \
77076,977079,977081-977550,977552-977783,977785-977803,977805-977839,977841-977849,977 \
851-977904,977906-978945,979702,979854,979874,979886,980011,980262,981052,981122,98159 \
6,982309,982636,982977,983096,983112-983113,983118,983121,983125,983130-983131,983136, \
983362,983366-983419,983421,983423-983424,983439,983537,983541,983598-983600,983607,983618-983619,983625,983767,983778,983785,98378
  7,983858,983897,985093,985129-985130,985205,985212-985213,985232-985233,985434,98543 \
6,985438-985439,985575,985879,986112,986114,986117,986133,986542,986544,986555,986570, \
986887,986965,986969,987053-987054,987066-987067,987070,989396,989514,989845-989847,98 \
9948,989954,990008,990537-990538,990774,991787,992553,992558,992560,992563,992565-9925 \
66,992665,992759,992871,993410,993423,993633,993823,994267,994275-994276,994657,995480 \
,996004,998025,998459,999842,1000512,1000998,1001006,1001019,1001185,1001279,1001281,1 \
001354,1001360,1001465,1001528,1001563-1001826,1001828-1001835,1001837-1002665,1002667 \
-1002945,1002947-1002963,1002965-1002978,1002980,1002982,1002984,1002986-1002992,10029 \
94-1003206,1003208-1003222,1003224-1003664,1003666-1003667,1003669-1004069,1004072-100 \
4073,1004075-1004135,1004137,1004140-1004153,1004157-1004170,1004172-1004200,1004202-1004554 \
/branches/kdepim/soc/kdepim:1-976464 \
/branches/work/akonadi-ports/kdepim:1-982690,983152-983679,983682-983689,983691-983808,
  983810-983816,983818-983822,983824-984000,984002-984066,984068-984464,984466,984468- \
984547,984549-984865,984868-984869,984871-985168,985170-985225,985227-985296,985298-98 \
5355,985357-985376,985378-985380,985382-985384,985391,985393-985418,985420-985621,9856 \
24-985689,985692-986257,986259-986273,986275-986285,986287-986407,986409-986533,986535 \
-986581,986583-986596,986598,986600-986682,986684-986726,986728-986742,986745,986751,9 \
86754,986765-986769,986771,986773-986996,986998-987007,987009-987148,987150-987483,987 \
485-987521,987523-987563,987565-987583,987585-987587,987589-987607,987609-987695,98769 \
7-987699,987701-987715,987717-987778,987780-987798,987800-988159,988161-988442,988444- \
988543,988545-989148,989150,989152,989154-989155,989157-989164,989166-989168,989170-98 \
9171,989173-989181,989183-989310,989312-989323,989325-989352,989354-989422,989424-989780,989782-991171,994702,996350
                
--- trunk/KDE/kdepim/kleopatra/commands/selftestcommand.cpp #1004706:1004707
@@ -143,7 +143,9 @@
         //emit q->info( i18n("Checking Ui Server connectivity...") );
         tests.push_back( makeUiServerConnectivitySelfTest() );
 #endif
+#ifndef Q_OS_WIN
         tests.push_back( makeGpgAgentConnectivitySelfTest() );
+#endif
 
         if ( !dialog && kdtools::none_of( tests, mem_fn( &Kleo::SelfTest::failed ) ) \
) {  finished();


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