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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim
From:       Pradeepto Bhattacharya <pradeepto () kde ! org>
Date:       2008-08-22 7:21:51
Message-ID: 1219389711.564203.14320.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 850720 by pradeepto:

Merged revisions 850540 via svnmerge from 
svn+ssh://pradeepto@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r850540 | vkrause | 2008-08-21 23:36:38 +0530 (Thu, 21 Aug 2008) | 4 lines
  
  Try harder to prevent canceling of this dialog.
  
  Kolab issue 2036
........


 _M            . (directory)  
 M  +5 -0      kresources/lib/folderselectdialog.cpp  
 M  +1 -0      kresources/lib/folderselectdialog.h  


** branches/kdepim/enterprise4/kdepim #property svnmerge-integrated
   - /branches/KDE/4.1/kdepim:1-835448,835459-835907,835909-836091,836093-836399,83640 \
1-837908,838076,838632,838637,838639,838644,838790,838809,838811,838979,839014-839015, \
839021,839049,839094,839116,839128,839149,839462-839464,839466,839487,839491,839493,83 \
9528,839555,839605,839607,839633-839634,839666,839683-839684,839697,840219,840356-840863,840865-841077,841083 \
/branches/kdepim/enterprise/kdepim:1-709144,709146-709321,709323-709402,709404,709406- \
709411,709413-709431,709433-709472,709474-709478,709480-709487,709489-709850,709852-71 \
0562,710564,710566-710623,710625-710634,710636-710641,710643,710645-711039,711041-7111 \
64,711166-711600,711602-711780,711782-712273,712275-712278,712280-713446,713448,713450 \
-713461,713463-714100,714102-714449,714451-715217,715219-715232,715234-716226,716228-7 \
16777,716779-717292,717294,717296-718340,718342-721121,721123-721424,721426-724381,724 \
383-724384,724386-724443,724445-727625,727627-728089,728091-728450,728452-728580,728582-729283,729285-7295
  80,729583-731333,731335-731361,731363-731669,731671-731719,731721-731867,731869-7318 \
70,731872-732022,732024-733047,733049-733088,733090-733148,733150-733463,733465-733468 \
,733470-734534,734536,734538-734580,734582,734586-734591,734593-735174,735176-735204,7 \
35206-735246,735248-735281,735283-735300,735302-736232,736235-736242,736244-736314,736 \
316-736376,736378,736380-736390,736392-737483,737485-737489,737492-737495,737497-74044 \
1,740443-740446,740448-740459,740461-740471,740473-743887,743889-744692,744694-744707, \
744709-746873,746875-746931,746933-747591,747593-750878,750880-757104,757106-757110,75 \
7112-758210,758212-758786,758788,758790-758794,758796-759131,759133-759152,759154-7592 \
71,759273-759274,759276,759278-759285,759287-760352,760354-761115,761117-761118,761120 \
-761123,761125-761127,761131,761134,761137,761139-761140,761144-761145,761147,761149-7 \
61230,761232-761240,761242-761244,761246-761330,761332-761334,761336-761337,761339-761374,761376-761533,761535,761537,761539-761546
  ,761548-761550,761552-761553,761555-761556,761558-761559,761561,761563-761564,761566 \
-761570,761572,761574-761580,761582-761601,761603-761620,761622-761895,761897-761900,7 \
61902-762898,762900-762904,762906-762907,762910-762921,762923-762988,762990-763015,763 \
017-763023,763025-763037,763040-763520,763522-764287,764289-764582,764584-764597,76459 \
9,764602-764604,764606-764610,764612-764617,764619-764627,764629,764631-764670,764672- \
764679,764681-764682,764684-764745,764747-764821,764823-764849,764851-764875,764877-76 \
4886,764888-764893,764895-765070,765072,765076-765079,765081-765082,765084-765085,7650 \
87-765096,765098-765103,765105-765131,765133-765138,765140,765143,765145-765155,765157 \
-765161,765163-765223,765225,765228-765229,765231-765233,765235,765237-765310,765312-7 \
65319,765321-765322,765324-765329,765331-765334,765336-765337,765339-765341,765347,765 \
351,765354-765357,765360-765362,765371,765373-765379,765381,765383,765385-765577,765579-765693,765695-765736,765738-765739,765742-7
  65745,765747-765749,765751-765753,765757-765760,765762,765764-765765,765767,765769,7 \
65773-765774,765777-765778,765780-765781,765783-765784,765789-765790,765792-765803,765 \
805-765852,765854-765856,765858-765874,765876,765878-766054,766056,766058-766085,76608 \
7-766088,766091-766093,766096-766111,766113-766120,766122-766139,766141-766217,766219- \
766232,766234-766246,766248-766266,766268-766278,766280-766287,766289-766344,766346-76 \
6356,766358-766366,766368-766370,766372-766373,766375-766388,766390-766420,766422-7665 \
38,766540-766734,766736-766749,766751-766768,766770-766774,766776-766780,766782,766784 \
-766789,766791-766831,766833-766834,766836,766838-766898,766900-767026,767028-767029,7 \
67031-767040,767042-767046,767048-767232,767234-767551,767553-767554,767556,767558-767 \
805,767807-767946,767948-767951,767953-768089,768091-768401,768403-768683,768685-76913 \
9,769141-769318,769320-769322,769324-769354,769356-769705,769707-769924,769926-771105,771107-771207,771209-771251,771253-771697,771
  699-772302,772304-772305,772307-772311,772313-772316,772318-773732,773734-774161,774 \
163-775014,775017-775035,775037-775040,775042-775194,775196-775202,775204,775207-77521 \
1,775213-778001,778003-778004,778007,778010-778011,778013-778029,778031-778727,778729- \
779448,779450-779482,779484-779499,779501-779505,779507-779693,779695-779852,779854-78 \
0175,780177-780210,780212-780452,780454-780495,780497,780499-780529,780531-782963,7829 \
65-783127,783129-783243,783245,783248-783477,783479-783566,783568-783846,783848-784380 \
,784383-784691,784693-785053,785055-785315,785318-785478,785480-785562,785564-785569,7 \
85571-787387,787389-787826,787828-788242,788245-788581,788583-788633,788635-791440,791 \
443-793304,793306-793471,793473-793538,793540-794733,794735-795763,795765,795767-79844 \
4,798447-798448,798450-798495,798497-800070,800072-800167,800169-800440,800442-800614, \
800616-802138,802140-802148,802150-802151,802153-803256,803258-803259,803261-803299,803301-803308,803310-803338,803340-803380,80338
  3-803397,803399-804108,804110-804615,804617-804990,804992-804993,804995-805460,80570 \
1-805702,807761,817088,817568-819076,819078-821035,821037-821124,821126-821345,821347- \
821370,821372-821378,821380-821648,821650,821652-821835,821837-822268,822270-823852,82 \
3854-824217,824219-824277,824279-824285,824287-825075,825077-825083,825085-825805,8258 \
07-826354,826356-827891,827893-827903,827905-827944,827946-827949,827951-828972,828974 \
-830132,830134-830477,830479-830549,830551-830875,830877-830932,830934-834241,837624,837626,840224-840649,840651-840654,840656-840684,842115-842659,843189,843750
  + /branches/KDE/4.1/kdepim:1-835448,835459-835907,835909-836091,836093-836399,836401 \
-837908,838076,838632,838637,838639,838644,838790,838809,838811,838979,839014-839015,8 \
39021,839049,839094,839116,839128,839149,839462-839464,839466,839487,839491,839493,839 \
528,839555,839605,839607,839633-839634,839666,839683-839684,839697,840219,840356-840863,840865-841077,841083 \
/branches/kdepim/enterprise/kdepim:1-709144,709146-709321,709323-709402,709404,709406- \
709411,709413-709431,709433-709472,709474-709478,709480-709487,709489-709850,709852-71 \
0562,710564,710566-710623,710625-710634,710636-710641,710643,710645-711039,711041-7111 \
64,711166-711600,711602-711780,711782-712273,712275-712278,712280-713446,713448,713450 \
-713461,713463-714100,714102-714449,714451-715217,715219-715232,715234-716226,716228-7 \
16777,716779-717292,717294,717296-718340,718342-721121,721123-721424,721426-724381,724 \
383-724384,724386-724443,724445-727625,727627-728089,728091-728450,728452-728580,728582-729283,729285-7295
  80,729583-731333,731335-731361,731363-731669,731671-731719,731721-731867,731869-7318 \
70,731872-732022,732024-733047,733049-733088,733090-733148,733150-733463,733465-733468 \
,733470-734534,734536,734538-734580,734582,734586-734591,734593-735174,735176-735204,7 \
35206-735246,735248-735281,735283-735300,735302-736232,736235-736242,736244-736314,736 \
316-736376,736378,736380-736390,736392-737483,737485-737489,737492-737495,737497-74044 \
1,740443-740446,740448-740459,740461-740471,740473-743887,743889-744692,744694-744707, \
744709-746873,746875-746931,746933-747591,747593-750878,750880-757104,757106-757110,75 \
7112-758210,758212-758786,758788,758790-758794,758796-759131,759133-759152,759154-7592 \
71,759273-759274,759276,759278-759285,759287-760352,760354-761115,761117-761118,761120 \
-761123,761125-761127,761131,761134,761137,761139-761140,761144-761145,761147,761149-7 \
61230,761232-761240,761242-761244,761246-761330,761332-761334,761336-761337,761339-761374,761376-761533,761535,761537,761539-761546
  ,761548-761550,761552-761553,761555-761556,761558-761559,761561,761563-761564,761566 \
-761570,761572,761574-761580,761582-761601,761603-761620,761622-761895,761897-761900,7 \
61902-762898,762900-762904,762906-762907,762910-762921,762923-762988,762990-763015,763 \
017-763023,763025-763037,763040-763520,763522-764287,764289-764582,764584-764597,76459 \
9,764602-764604,764606-764610,764612-764617,764619-764627,764629,764631-764670,764672- \
764679,764681-764682,764684-764745,764747-764821,764823-764849,764851-764875,764877-76 \
4886,764888-764893,764895-765070,765072,765076-765079,765081-765082,765084-765085,7650 \
87-765096,765098-765103,765105-765131,765133-765138,765140,765143,765145-765155,765157 \
-765161,765163-765223,765225,765228-765229,765231-765233,765235,765237-765310,765312-7 \
65319,765321-765322,765324-765329,765331-765334,765336-765337,765339-765341,765347,765 \
351,765354-765357,765360-765362,765371,765373-765379,765381,765383,765385-765577,765579-765693,765695-765736,765738-765739,765742-7
  65745,765747-765749,765751-765753,765757-765760,765762,765764-765765,765767,765769,7 \
65773-765774,765777-765778,765780-765781,765783-765784,765789-765790,765792-765803,765 \
805-765852,765854-765856,765858-765874,765876,765878-766054,766056,766058-766085,76608 \
7-766088,766091-766093,766096-766111,766113-766120,766122-766139,766141-766217,766219- \
766232,766234-766246,766248-766266,766268-766278,766280-766287,766289-766344,766346-76 \
6356,766358-766366,766368-766370,766372-766373,766375-766388,766390-766420,766422-7665 \
38,766540-766734,766736-766749,766751-766768,766770-766774,766776-766780,766782,766784 \
-766789,766791-766831,766833-766834,766836,766838-766898,766900-767026,767028-767029,7 \
67031-767040,767042-767046,767048-767232,767234-767551,767553-767554,767556,767558-767 \
805,767807-767946,767948-767951,767953-768089,768091-768401,768403-768683,768685-76913 \
9,769141-769318,769320-769322,769324-769354,769356-769705,769707-769924,769926-771105,771107-771207,771209-771251,771253-771697,771
  699-772302,772304-772305,772307-772311,772313-772316,772318-773732,773734-774161,774 \
163-775014,775017-775035,775037-775040,775042-775194,775196-775202,775204,775207-77521 \
1,775213-778001,778003-778004,778007,778010-778011,778013-778029,778031-778727,778729- \
779448,779450-779482,779484-779499,779501-779505,779507-779693,779695-779852,779854-78 \
0175,780177-780210,780212-780452,780454-780495,780497,780499-780529,780531-782963,7829 \
65-783127,783129-783243,783245,783248-783477,783479-783566,783568-783846,783848-784380 \
,784383-784691,784693-785053,785055-785315,785318-785478,785480-785562,785564-785569,7 \
85571-787387,787389-787826,787828-788242,788245-788581,788583-788633,788635-791440,791 \
443-793304,793306-793471,793473-793538,793540-794733,794735-795763,795765,795767-79844 \
4,798447-798448,798450-798495,798497-800070,800072-800167,800169-800440,800442-800614, \
800616-802138,802140-802148,802150-802151,802153-803256,803258-803259,803261-803299,803301-803308,803310-803338,803340-803380,80338
  3-803397,803399-804108,804110-804615,804617-804990,804992-804993,804995-805460,80570 \
1-805702,807761,817088,817568-819076,819078-821035,821037-821124,821126-821345,821347- \
821370,821372-821378,821380-821648,821650,821652-821835,821837-822268,822270-823852,82 \
3854-824217,824219-824277,824279-824285,824287-825075,825077-825083,825085-825805,8258 \
07-826354,826356-827891,827893-827903,827905-827944,827946-827949,827951-828972,828974 \
-830132,830134-830477,830479-830549,830551-830875,830877-830932,830934-834241,837624,8 \
                37626,840224-840649,840651-840654,840656-840684,842115-842659,843189,843750,850540
                
--- branches/kdepim/enterprise4/kdepim/kresources/lib/folderselectdialog.cpp \
#850719:850720 @@ -88,3 +88,8 @@
 {
   event->ignore();
 }
+
+void FolderSelectDialog::reject()
+{
+}
+
--- branches/kdepim/enterprise4/kdepim/kresources/lib/folderselectdialog.h \
#850719:850720 @@ -51,6 +51,7 @@
 
 protected:
   virtual void closeEvent(QCloseEvent *event);
+  void reject();
 private:
   K3ListBox* mListBox;
 };


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