1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index aa01c96..d27f041 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -170,17 +170,8 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
connectDCOPSignal( 0, 0, "kmailSelectFolder(TQString)",
"selectFolder(TQString)", false );
- mNetworkManager = TDEGlobal::networkManager();
- if (mNetworkManager) {
- connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ),
- this, TQT_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) );
- if (networkStateConnected()) {
- resumeNetworkJobs();
- }
- else {
- stopNetworkJobs();
- }
- }
+ // Assume connected
+ resumeNetworkJobs();
}
KMKernel::~KMKernel ()
@@ -2470,34 +2461,8 @@ int KMKernel::timeOfLastMessageCountChange() const
bool KMKernel::networkStateConnected()
{
- if (mNetworkManager) {
- TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags networkStatus = mNetworkManager->backendStatus();
- if ((networkStatus & TDENetworkGlobalManagerFlags::Connected)
- || (networkStatus & TDENetworkGlobalManagerFlags::BackendUnavailable)
- || (networkStatus == TDENetworkGlobalManagerFlags::Unknown)
- ){
- // Connected or no backend available
- return true;
- }
- else {
- // Not connected
- return false;
- }
- }
- else {
- // Assume connected
- return true;
- }
-}
-
-void KMKernel::slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)
-{
- if (networkStateConnected()) {
- resumeNetworkJobs();
- }
- else {
- stopNetworkJobs();
- }
+ // Assume connected
+ return true;
}
Wallet *KMKernel::wallet() {
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 0dc4644..37a3eec 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -14,8 +14,6 @@
#include <tdeimproxy.h>
#include <tdepimmacros.h>
-#include <tdenetworkconnections.h>
-
#include "kmailIface.h"
#include "kmmsgbase.h"
#include "globalsettings.h"
@@ -436,7 +434,6 @@ public slots:
protected slots:
void slotDataReq(TDEIO::Job*,TQByteArray&);
void slotResult(TDEIO::Job*);
- void slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString);
signals:
void configChanged();
@@ -527,7 +524,6 @@ private:
TQString mAddMessageLastFolder;
KMFolder *mAddMsgCurrentFolder;
- TDEGlobalNetworkManager *mNetworkManager;
};
#endif
|
